Merge lp:~alecu/ubuntuone-client/signature-dict into lp:ubuntuone-client

[Alejandro J. Cura]

- Use dbus.Dictionary to specify signature when using empty dicts for SSO calls. (LP: #711162)

[dobey (dobey)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'tests/platform/credentials/test_linux.py'
--- tests/platform/credentials/test_linux.py	2012-05-14 19:04:43 +0000
+++ tests/platform/credentials/test_linux.py	2012-05-24 19:16:19 +0000
@@ -402,6 +402,32 @@
         self.assertEqual(self.sso_server._args, params)
 
 
+class DictSignatureTestCase(DBusTestCase):
+    """Test the errors with dict signatures."""
+
+    def verify(self, app_name, options_dict, reply_handler, error_handler):
+        """Verify that the options_dict is a dbus.Dictionary."""
+        self.assertIsInstance(options_dict, dbus.Dictionary)
+
+    def test_find_credentials_dict_signature(self):
+        """Test for find_credentials."""
+        creds_man = CredentialsManagement()
+        self.patch(creds_man.sso_proxy, "find_credentials", self.verify)
+        creds_man.find_credentials()
+
+    def test_find_credentials_sync_dict_signature(self):
+        """Test for find_credentials_sync."""
+        creds_man = CredentialsManagement()
+        self.patch(creds_man.sso_proxy, "find_credentials_sync", self.verify)
+        creds_man.find_credentials_sync()
+
+    def test_clear_credentials_dict_signature(self):
+        """Test for clear_credentials."""
+        creds_man = CredentialsManagement()
+        self.patch(creds_man.sso_proxy, "clear_credentials", self.verify)
+        creds_man.clear_credentials()
+
+
 class SameAppNoErrorTestCase(CredentialsManagementTestCase):
     """Test case when the app_name matches APP_NAME and there was no error."""
 

=== modified file 'ubuntuone/platform/credentials/linux.py'
--- ubuntuone/platform/credentials/linux.py	2012-04-09 20:07:05 +0000
+++ ubuntuone/platform/credentials/linux.py	2012-05-24 19:16:19 +0000
@@ -30,6 +30,7 @@
 # files in the program, then also delete it here.
 """Ubuntu One credentials management dbus service."""
 
+import dbus
 import dbus.service
 import ubuntu_sso
 
@@ -181,7 +182,8 @@
     def find_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
         """Ask the Ubuntu One credentials."""
         self.ref_count += 1
-        self.sso_proxy.find_credentials(APP_NAME, {},
+        self.sso_proxy.find_credentials(APP_NAME,
+                                        dbus.Dictionary({}, signature='ss'),
             reply_handler=reply_handler, error_handler=error_handler)
 
     @dbus.service.method(dbus_interface=DBUS_CREDENTIALS_IFACE,
@@ -205,7 +207,9 @@
             self.ref_count -= 1
 
         self.ref_count += 1
-        self.sso_proxy.find_credentials_sync(APP_NAME, {},
+        self.sso_proxy.find_credentials_sync(
+            APP_NAME,
+            dbus.Dictionary({}, signature='ss'),
             reply_handler=decrease_counter_success,
             error_handler=decrease_counter_error)
 
@@ -214,7 +218,8 @@
     def clear_credentials(self, reply_handler=NO_OP, error_handler=NO_OP):
         """Clear the Ubuntu One credentials."""
         self.ref_count += 1
-        self.sso_proxy.clear_credentials(APP_NAME, {},
+        self.sso_proxy.clear_credentials(APP_NAME,
+                                         dbus.Dictionary({}, signature='ss'),
             reply_handler=reply_handler, error_handler=error_handler)
 
     @dbus.service.method(dbus_interface=DBUS_CREDENTIALS_IFACE,