Merge lp://qastaging/~dobey/desktopcouch/u1-connection into lp://qastaging/desktopcouch
Proposed by
dobey
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | dobey | ||||
Approved revision: | 243 | ||||
Merged at revision: | 239 | ||||
Proposed branch: | lp://qastaging/~dobey/desktopcouch/u1-connection | ||||
Merge into: | lp://qastaging/desktopcouch | ||||
Diff against target: |
272 lines (+125/-14) 9 files modified
desktopcouch/application/pair/couchdb_pairing/network_io.py (+1/-1) desktopcouch/application/platform/linux/__init__.py (+3/-0) desktopcouch/application/plugins/__init__.py (+41/-0) desktopcouch/application/plugins/tests/__init__.py (+1/-0) desktopcouch/application/plugins/tests/test_ubuntuone_pairing.py (+36/-1) desktopcouch/application/plugins/ubuntuone_pairing.py (+33/-3) desktopcouch/pair/couchdb_pairing/ubuntuone_pairing.py (+5/-5) desktopcouch/records/tests/test_field_registry.py (+1/-1) desktopcouch/records/tests/test_server.py (+4/-3) |
||||
To merge this branch: | bzr merge lp://qastaging/~dobey/desktopcouch/u1-connection | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Manuel de la Peña (community) | Approve | ||
Chad Miller (community) | Approve | ||
Review via email:
|
Commit message
Add simple plug-ins handling
Put the Ubuntu One pairing bits into a plug-in
To post a comment you must log in.
Looks pretty good. This mystifies me, but doesn't do anything *bad*.
67 + except KeyboardInterrupt:
68 + raise