Merge lp:~chipaca/ubuntuone-client/fix-u1prefs-self-removal into lp:ubuntuone-client

[John Lenton]

correctly stringify http errors that occur in restclient (in another process), and fix the call to bus.get_object in the case of removing the current machine's token.

correctly stringify http errors that occur in restclient (in another process), and fix the call to bus.get_object in the case of removing the current machine's token.

[Matt Griffin (mattgriffin)]

Tested and my devices are removed without error (including your current device). I'd like it to clear the Account tab info as well but I'd also like to eat ice cream at every meal... so I guess you can't have it all.
Approved :)

review: Approve

[Alejandro J. Cura (alecu)]

We'll have Ice Cream for every meal for N! :-)

review: Approve

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-09-16 13:08:33 +0000
+++ bin/ubuntuone-preferences	2010-09-21 21:46:03 +0000
@@ -464,7 +464,7 @@
 
         if token == oauth_token.key:
             try:
-                client = self.bus.get_object(DBUS_IFACE_CRED_NAME,
+                client = self.bus.get_object(DBUS_BUS_NAME,
                                              DBUS_CRED_PATH,
                                              follow_name_owner_changes=True)
                 iface = dbus.Interface(client, DBUS_IFACE_CRED_NAME)

=== modified file 'ubuntuone/api/restclient.py'
--- ubuntuone/api/restclient.py	2010-09-13 13:32:04 +0000
+++ ubuntuone/api/restclient.py	2010-09-21 21:46:03 +0000
@@ -68,6 +68,6 @@
             return simplejson.loads(data)
 
         except urllib2.HTTPError, e:
-            print e
-            return {'error' : e}
-        
+            # the error is not pickle-able, so str() it
+            return {'error' : str(e)}
+