Merge lp://qastaging/~statik/desktopcouch/prefer-json-simplejson into lp://qastaging/desktopcouch
Proposed by
Elliot Murphy
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp://qastaging/~statik/desktopcouch/prefer-json-simplejson |
Merge into: | lp://qastaging/desktopcouch |
Diff against target: |
20 lines (+8/-1) 1 file modified
desktopcouch/replication_services/ubuntuone.py (+8/-1) |
To merge this branch: | bzr merge lp://qastaging/~statik/desktopcouch/prefer-json-simplejson |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Cole (community) | Needs Fixing | ||
Chad Miller (community) | Approve | ||
Review via email:
|
Commit message
Use the built in json module in python2.6 when the simplejson module is not available.
Description of the change
Use built in json module in python2.6.
To post a comment you must log in.
Yes!