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

[dobey]

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

[Mike McCracken (mikemc)]

Hooray!

review: Approve

=== modified file 'tests/syncdaemon/test_interaction_interfaces.py'
--- tests/syncdaemon/test_interaction_interfaces.py	2012-08-08 13:21:13 +0000
+++ tests/syncdaemon/test_interaction_interfaces.py	2012-10-24 15:14:22 +0000
@@ -33,7 +33,7 @@
 
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
-from ubuntu_sso.networkstate import ONLINE
+from ubuntu_sso.networkstate.networkstates import ONLINE
 
 from contrib.testing.testcase import (
     FakeCommand,
 
=== modified file 'ubuntuone/syncdaemon/interaction_interfaces.py'
--- ubuntuone/syncdaemon/interaction_interfaces.py	2012-09-14 22:46:21 +0000
+++ ubuntuone/syncdaemon/interaction_interfaces.py	2012-10-24 15:14:22 +0000
@@ -46,7 +46,8 @@
 
 from twisted.internet import defer
 
-from ubuntu_sso.networkstate import NetworkManagerState, ONLINE
+from ubuntu_sso.networkstate import NetworkManagerState
+from ubuntu_sso.networkstate.networkstates import ONLINE
 
 from ubuntuone.logger import log_call
 from ubuntuone.platform import credentials, ExternalInterface