Ubuntu One Control Panel

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

  1. use-json
  2. Merge into trunk
Proposed by Barry Warsaw
Status: Merged
Approved by: dobey
Approved revision: 339
Merged at revision: 380
Proposed branch: lp://qastaging/~barry/ubuntuone-control-panel/use-json
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 49 lines (+4/-5)
2 files modified
ubuntuone/controlpanel/tests/test_backend.py (+2/-3)
ubuntuone/controlpanel/web_client.py (+2/-2)
To merge this branch: bzr merge lp://qastaging/~barry/ubuntuone-control-panel/use-json
Reviewer Review Type Date Requested Status
dobey (community) Approve
Review via email: mp+133517@code.qastaging.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote :

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

Revision history for this message
dobey (dobey) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

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>

Revision history for this message
Barry Warsaw (barry) wrote :

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.

Revision history for this message
dobey (dobey) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches