Merge lp:~barry/ubuntuone-control-panel/use-json into lp:ubuntuone-control-panel

[Barry Warsaw]

Replace the third party simplejson module with the stdlib json module.

Switch from simplejson to the built-in json module. This allows us to remove simplejson as a task:ubuntu dependency and drop simplejson (and thus one of the Python 2 dependencies) from the image.

[Barry Warsaw (barry)]

Also, in the packaging branch, please drop python-simplejson from Depends.

[dobey (dobey)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    contributor-agreement-canonical
    ubuntuone-hackers

Unaccepted Authors:

    Barry Warsaw <email address hidden>

[Barry Warsaw (barry)]

I have no idea what that error means, but that address *is* registered with Launchpad. If it's a problem, just use my <email address hidden> or <email address hidden> address instead.

[dobey (dobey)]

The error means you're not in any of the listed teams, is all. The e-mail address is from the bzr commit, and if it weren't registered on LP, would result in a different error. Anyway, I've done the workaround.

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2012-10-29 16:02:46 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-11-08 16:38:29 +0000
@@ -16,13 +16,12 @@
 
 """Tests for the control panel backend."""
 
+import json
 import operator
 import os
 
 from collections import defaultdict
 
-import simplejson
-
 from twisted.internet import defer
 from twisted.internet.defer import inlineCallbacks, returnValue
 from ubuntuone.devtools.handlers import MementoHandler
@@ -106,7 +105,7 @@
         elif self.failure:
             return defer.fail(backend.WebClientError(self.failure))
         else:
-            result = simplejson.loads(self.results[method])
+            result = json.loads(self.results[method])
             return defer.succeed(result)
 
     @defer.inlineCallbacks
 
=== modified file 'ubuntuone/controlpanel/web_client.py'
--- ubuntuone/controlpanel/web_client.py	2012-10-23 19:26:30 +0000
+++ ubuntuone/controlpanel/web_client.py	2012-11-08 16:38:29 +0000
@@ -16,7 +16,7 @@
 
 """The web client."""
 
-import simplejson
+import json
 
 from twisted.internet import defer
 from ubuntu_sso.utils.webclient import webclient_factory
@@ -48,7 +48,7 @@
         credentials = yield self.get_credentials()
         response = yield self.wc.request(iri, extra_headers=extra_headers,
                                      oauth_credentials=credentials)
-        result = simplejson.loads(response.content)
+        result = json.loads(response.content)
         defer.returnValue(result)
 
     @defer.inlineCallbacks