Gwibber

Merge lp:~robru/gwibber/protocol into lp:~barry/gwibber/py3

  1. protocol
  2. Merge into py3
Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 1408
Proposed branch: lp:~robru/gwibber/protocol
Merge into: lp:~barry/gwibber/py3
Diff against target: 27 lines (+3/-3)
2 files modified
gwibber/gwibber/tests/test_account.py (+2/-2)
gwibber/gwibber/utils/account.py (+1/-1)
To merge this branch: bzr merge lp:~robru/gwibber/protocol
Reviewer Review Type Date Requested Status
Barry Warsaw Pending
Review via email: mp+122758@code.launchpad.net

Description of the change

Just a quick rename in the Account class so that we can all use the protocol terminology consistently.

I think this is a big win for standard terminology, makes it easier to think about conceptually. No need to remember that 'service' and 'plugin' are the same thing, now that I can see it's all just protocols, it makes more sense.

Thanks again barry!

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/gwibber/tests/test_account.py'
2--- gwibber/gwibber/tests/test_account.py 2012-08-29 20:01:19 +0000
3+++ gwibber/gwibber/tests/test_account.py 2012-09-04 20:58:19 +0000
4@@ -83,8 +83,8 @@
5 self.assertEqual(self.account['id'], 'fake_id/fake_service')
6
7 def test_account_service(self):
8- # The 'service' key of the account gets the service provider name.
9- self.assertEqual(self.account['service'], 'fake_provider')
10+ # The 'protocol' key of the account gets the service provider name.
11+ self.assertEqual(self.account['protocol'], 'fake_provider')
12
13 def test_on_account_changed(self):
14 # Account.on_account_changed() gets called during the Account
15
16=== modified file 'gwibber/gwibber/utils/account.py'
17--- gwibber/gwibber/utils/account.py 2012-08-29 20:01:19 +0000
18+++ gwibber/gwibber/utils/account.py 2012-09-04 20:58:19 +0000
19@@ -31,7 +31,7 @@
20 service_name = account_service.get_service().get_name()
21 self['id'] = '{}/{}'.format(self.global_id, service_name)
22 # The provider name in libaccounts should match the name of our plugin.
23- self['service'] = account.get_provider_name()
24+ self['protocol'] = account.get_provider_name()
25 account_service.connect('changed', self.on_account_changed, account)
26 self.on_account_changed(account_service, account)
27 # This is used to prevent multiple simultaneous login attempts.

Subscribers

People subscribed via source and target branches