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

Proposed by Elliot Murphy
Status: Merged
Approved by: Elliot Murphy
Approved revision: 137
Merged at revision: not available
Proposed branch: lp:~statik/desktopcouch/prefer-json-simplejson
Merge into: lp:desktopcouch
Diff against target: 12 lines (+1/-1)
1 file modified
desktopcouch/replication_services/ (+1/-1)
To merge this branch: bzr merge lp:~statik/desktopcouch/prefer-json-simplejson
Reviewer Review Type Date Requested Status
Eric Casteleijn (community) Approve
Rick McBride (community) Approve
Review via email:

Commit message

Fix a missed rename of simplejson->json

Description of the change

Fix a missed rename.

To post a comment you must log in.
Revision history for this message
Eric Casteleijn (thisfred) wrote :

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
Revision history for this message
Rick McBride (rmcbride) wrote :

Simple, makes sense.

review: Approve
Revision history for this message
Eric Casteleijn (thisfred) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'desktopcouch/replication_services/'
2--- desktopcouch/replication_services/ 2010-03-10 22:17:31 +0000
3+++ desktopcouch/replication_services/ 2010-03-10 22:43:21 +0000
4@@ -111,7 +111,7 @@
5 client = httplib2.Http()
6 resp, content = client.request(url, "GET", headers=self.oauth_header)
7 if resp['status'] == "200":
8- document = simplejson.loads(content)
9+ document = json.loads(content)
10 if "couchdb_root" not in document:
11 raise ValueError("couchdb_root not found in %s" % (document,))
12 self.str = document["couchdb_root"]


People subscribed via source and target branches