Merge lp:~nataliabidart/ubuntuone-client/no-more-clientdefs into lp:ubuntuone-client

[Natalia Bidart]

- Removing dependency to clientdefs in ubuntuone-launch. Removing dependency to ubuntu_sso in dbus_interface.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Roman Yepishev (rye)]

ubuntuone-launch is working fine with these changes.

review: Approve (fieldtest)

=== modified file 'bin/ubuntuone-launch'
--- bin/ubuntuone-launch	2011-01-05 21:36:43 +0000
+++ bin/ubuntuone-launch	2011-03-22 16:31:03 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-# ubuntuone-start - Ubuntu One storage synchronization daemon startup helper
+# ubuntuone-launch - Ubuntu One storage synchronization daemon startup helper
 #
 # Author: John Lenton <[e-mail]>
 #
@@ -53,9 +53,8 @@
 import glib
 import gobject
 from dbus.mainloop.glib import DBusGMainLoop
+from ubuntuone.platform.credentials import CredentialsManagementTool
 from ubuntuone.platform.tools import SyncDaemonTool, is_running
-from ubuntuone.clientdefs import APP_NAME as SD_APP_NAME
-from ubuntu_sso.main import SSOCredentials
 from twisted.internet import defer
 
 
@@ -68,14 +67,9 @@
     else:
         # one last check: avoid having sso pop up asking for creds if
         # the user deleted them
+        creds_tools = CredentialsManagementTool()
+        d = creds_tools.find_credentials()
 
-        # XXX: that this works with None is probably excessive
-        # chumminess with the implementation
-        creds = SSOCredentials(None)
-        if creds.find_credentials(SD_APP_NAME):
-            d = sync_daemon_tool.connect()
-        else:
-            d = defer.fail(RuntimeError("no creds"))
     return d
 
 

=== modified file 'tests/platform/linux/test_dbus.py'
--- tests/platform/linux/test_dbus.py	2011-03-08 20:25:00 +0000
+++ tests/platform/linux/test_dbus.py	2011-03-22 16:31:03 +0000
@@ -29,8 +29,6 @@
 from twisted.internet import defer, reactor
 from twisted.python import failure
 
-from ubuntu_sso.main import SSOCredentials
-
 from contrib.testing.testcase import (
     BaseTwistedTestCase, FakeMain, FAKED_CREDENTIALS)
 
@@ -76,41 +74,6 @@
 from ubuntuone.devtools.testcase import DBusTestCase
 
 
-# OAuth stubs
-class FakeLoginProcessor(object):
-    """Stub login processor."""
-
-    def __init__(self, dbus_object):
-        """Initialize the login processor."""
-        self.next_login_cb = None
-
-    def login(self, realm, consumer_key, error_handler=None,
-              reply_handler=None, do_login=True):
-        """Stub, call self.next_login_cb or send NewCredentials if
-        self.next_login_cb isn't defined.
-        """
-        self.realm = str(realm)
-        self.consumer_key = str(consumer_key)
-        if self.next_login_cb:
-            cb = self.next_login_cb[0]
-            args = self.next_login_cb[1]
-            self.next_login_cb = None
-            return cb(*args)
-        else:
-            self.dbus_object.NewCredentials(realm, consumer_key)
-
-    def clear_token(self, realm, consumer_key):
-        """Stub, do nothing"""
-        pass
-
-    def next_login_with(self, callback, args=tuple()):
-        """shortcircuit the next call to login and call the specified callback.
-        callback is usually one of: self.got_token, self.got_no_token,
-        self.got_denial or self.got_error.
-        """
-        self.next_login_cb = (callback, args)
-
-
 class FakeDBusInterface(object):
     """A fake DBusInterface..."""
 
@@ -204,28 +167,6 @@
             self.fail(str(error))
 
 
-class FakeLogin(SSOCredentials):
-    """Stub Object which listens for D-Bus OAuth requests"""
-
-    def __init__(self, bus):
-        """Initiate the object."""
-        self.bus = bus
-        self.busName = dbus.service.BusName(DBUS_CREDENTIALS_IFACE,
-                                            bus=self.bus)
-        # bypass the parent class __init__ as it has the path hardcoded
-        # and we can't use '/' as the path, as we are already using it
-        # for syncdaemon. pylint: disable-msg=W0233,W0231
-        dbus.service.Object.__init__(self, object_path="/oauthdesktop",
-                                     bus_name=self.busName)
-        self.processor = FakeLoginProcessor(self)
-        self.currently_authing = False
-
-    def shutdown(self):
-        """Shutdown and remove any trace from the bus"""
-        self.busName.get_bus().release_name(self.busName.get_name())
-        self.remove_from_connection()
-
-
 class FakeNetworkManager(DBusExposedObject):
     """ A fake NetworkManager that only emits StatusChanged signal. """