Gwibber

Merge lp:~robru/gwibber/broken-protocols into lp:~barry/gwibber/py3

  1. broken-protocols
  2. Merge into py3
Proposed by Robert Bruce Park
Status: Merged
Merged at revision: 1429
Proposed branch: lp:~robru/gwibber/broken-protocols
Merge into: lp:~barry/gwibber/py3
Diff against target: 92 lines (+15/-4) (has conflicts)
6 files modified
gwibber/gwibber/service/dispatcher.py (+5/-0)
gwibber/gwibber/tests/test_account.py (+1/-1)
gwibber/gwibber/tests/test_flickr.py (+1/-1)
gwibber/gwibber/tests/test_protocols.py (+1/-1)
gwibber/gwibber/utils/account.py (+4/-1)
gwibber/gwibber/utils/protocol.py (+3/-0)
Text conflict in gwibber/gwibber/service/dispatcher.py
Text conflict in gwibber/gwibber/utils/account.py
To merge this branch: bzr merge lp:~robru/gwibber/broken-protocols
Reviewer Review Type Date Requested Status
Barry Warsaw Pending
Review via email: mp+124074@code.launchpad.net

Description of the change

Why doesn't this work, Barry? WHY DOESN'T IT WORK?!

To post a comment you must log in.
lp:~robru/gwibber/broken-protocols updated
1440. By Robert Bruce Park

Fix import orders in order for importlib to successfully find our plugins.

Revision history for this message
Robert Bruce Park (robru) wrote :

Ok it works now, please merge ;-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/gwibber/service/dispatcher.py'
2--- gwibber/gwibber/service/dispatcher.py 2012-09-12 22:15:43 +0000
3+++ gwibber/gwibber/service/dispatcher.py 2012-09-13 17:04:20 +0000
4@@ -28,7 +28,12 @@
5
6 from gi.repository import GLib
7
8+<<<<<<< TREE
9 from gwibber.utils.account import AccountManager, protocol_manager
10+=======
11+from gwibber.utils.account import AccountManager
12+from gwibber.utils.protocol import protocolmanager
13+>>>>>>> MERGE-SOURCE
14 from gwibber.utils.avatar import Avatar
15 from gwibber.utils.signaler import signaler
16
17
18=== modified file 'gwibber/gwibber/tests/test_account.py'
19--- gwibber/gwibber/tests/test_account.py 2012-09-07 21:51:08 +0000
20+++ gwibber/gwibber/tests/test_account.py 2012-09-13 17:04:20 +0000
21@@ -24,9 +24,9 @@
22 import unittest
23
24 from gwibber.errors import UnsupportedProtocolError
25-from gwibber.protocols.flickr import Flickr
26 from gwibber.testing.helpers import FakeAccount, SettingsIterMock
27 from gwibber.utils.account import Account, AccountManager
28+from gwibber.protocols.flickr import Flickr
29
30 try:
31 # Python 3.3
32
33=== modified file 'gwibber/gwibber/tests/test_flickr.py'
34--- gwibber/gwibber/tests/test_flickr.py 2012-09-12 19:47:58 +0000
35+++ gwibber/gwibber/tests/test_flickr.py 2012-09-13 17:04:20 +0000
36@@ -22,9 +22,9 @@
37 import unittest
38
39 from gwibber.errors import AuthorizationError
40-from gwibber.protocols.flickr import Flickr
41 from gwibber.testing.helpers import FakeAccount, LogPreserver
42 from gwibber.testing.mocks import FakeData
43+from gwibber.protocols.flickr import Flickr
44
45 try:
46 # Python 3.3
47
48=== modified file 'gwibber/gwibber/tests/test_protocols.py'
49--- gwibber/gwibber/tests/test_protocols.py 2012-09-12 22:15:43 +0000
50+++ gwibber/gwibber/tests/test_protocols.py 2012-09-13 17:04:20 +0000
51@@ -23,9 +23,9 @@
52 import unittest
53 import threading
54
55+from gwibber.utils.protocol import Base, ProtocolManager
56 from gwibber.protocols.flickr import Flickr
57 from gwibber.protocols.twitter import Twitter
58-from gwibber.utils.protocol import Base, ProtocolManager
59
60
61 class TestProtocolManager(unittest.TestCase):
62
63=== modified file 'gwibber/gwibber/utils/account.py'
64--- gwibber/gwibber/utils/account.py 2012-09-12 22:15:43 +0000
65+++ gwibber/gwibber/utils/account.py 2012-09-13 17:04:20 +0000
66@@ -28,11 +28,14 @@
67 from threading import Lock
68
69 from gwibber.errors import UnsupportedProtocolError
70-from gwibber.utils.protocol import ProtocolManager
71+from gwibber.utils.protocol import protocolmanager
72
73
74 log = logging.getLogger('gwibber.accounts')
75+<<<<<<< TREE
76 protocol_manager = ProtocolManager()
77+=======
78+>>>>>>> MERGE-SOURCE
79
80
81 class AccountManager:
82
83=== modified file 'gwibber/gwibber/utils/protocol.py'
84--- gwibber/gwibber/utils/protocol.py 2012-09-12 20:54:13 +0000
85+++ gwibber/gwibber/utils/protocol.py 2012-09-13 17:04:20 +0000
86@@ -119,3 +119,6 @@
87 obj = getattr(module, name)
88 if issubclass(obj, Base):
89 yield obj
90+
91+# This is incapable of finding any plugins
92+protocolmanager = ProtocolManager()

Subscribers

People subscribed via source and target branches