Merge lp:~statik/desktopcouch/prefer-json-simplejson into lp:desktopcouch

[Elliot Murphy]

Fix a missed rename of simplejson->json

Fix a missed rename.

[Eric Casteleijn (thisfred)]

Hmm, launchpad says no diff, and merging this into trunk also gives: Nothing to do.

Incidentally, does this means we're making d-c officially python 2.5 incompatible now, or was this a fix the other way? If so, we need to take care to never upgrade beyond this point on the server, as long as we're on hardy there. I'd prefer to not do such breakage before we've abandoned 2.5 everywhere.

review: Needs Information

[Rick McBride (rmcbride)]

Simple, makes sense.

review: Approve

[Eric Casteleijn (thisfred)]

ah, ok, never mind, the change just showed up, and this is just a bugfix, ignore my other comments. Tests pass, all good!

review: Approve

=== modified file 'desktopcouch/replication_services/ubuntuone.py'
--- desktopcouch/replication_services/ubuntuone.py	2010-03-10 22:17:31 +0000
+++ desktopcouch/replication_services/ubuntuone.py	2010-03-10 22:43:21 +0000
@@ -111,7 +111,7 @@
         client = httplib2.Http()
         resp, content = client.request(url, "GET", headers=self.oauth_header)
         if resp['status'] == "200":
-            document = simplejson.loads(content)
+            document = json.loads(content)
             if "couchdb_root" not in document:
                 raise ValueError("couchdb_root not found in %s" % (document,))
             self.str = document["couchdb_root"]