Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/lint-roller into lp:ubuntuone-client

  1. lint-roller
  2. Merge into trunk
Proposed by dobey on 2012-10-24
Status: Merged
Approved by: Roberto Alsina on 2012-10-24
Approved revision: 1349
Merged at revision: 1351
Proposed branch: lp:~dobey/ubuntuone-client/lint-roller
Merge into: lp:ubuntuone-client
Diff against target: 26 lines (+3/-2)
2 files modified
tests/syncdaemon/test_interaction_interfaces.py (+1/-1)
ubuntuone/syncdaemon/interaction_interfaces.py (+2/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/lint-roller
Reviewer Review Type Date Requested Status
Mike McCracken (community) 2012-10-24 Approve on 2012-10-24
Review via email: mp+131208@code.launchpad.net

Commit Message

Import some SSO API from the correct places, and not the re-exported versions.

To post a comment you must log in.
Mike McCracken (mikemc) wrote :

Hooray!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
2--- tests/syncdaemon/test_interaction_interfaces.py 2012-08-08 13:21:13 +0000
3+++ tests/syncdaemon/test_interaction_interfaces.py 2012-10-24 15:14:22 +0000
4@@ -33,7 +33,7 @@
5
6 from twisted.internet import defer
7 from ubuntuone.devtools.handlers import MementoHandler
8-from ubuntu_sso.networkstate import ONLINE
9+from ubuntu_sso.networkstate.networkstates import ONLINE
10
11 from contrib.testing.testcase import (
12 FakeCommand,
13
14=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
15--- ubuntuone/syncdaemon/interaction_interfaces.py 2012-09-14 22:46:21 +0000
16+++ ubuntuone/syncdaemon/interaction_interfaces.py 2012-10-24 15:14:22 +0000
17@@ -46,7 +46,8 @@
18
19 from twisted.internet import defer
20
21-from ubuntu_sso.networkstate import NetworkManagerState, ONLINE
22+from ubuntu_sso.networkstate import NetworkManagerState
23+from ubuntu_sso.networkstate.networkstates import ONLINE
24
25 from ubuntuone.logger import log_call
26 from ubuntuone.platform import credentials, ExternalInterface

Subscribers

People subscribed via source and target branches