Merge lp://staging/~cjwatson/loggerhead/remove-simplejson into lp://staging/loggerhead
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Merged at revision: | 505 |
| Proposed branch: | lp://staging/~cjwatson/loggerhead/remove-simplejson |
| Merge into: | lp://staging/loggerhead |
| Diff against target: |
229 lines (+24/-23) 12 files modified
.travis.yml (+1/-1) NEWS (+3/-0) byov.conf (+1/-1) docs/index.rst (+0/-4) loggerhead/controllers/__init__.py (+4/-3) loggerhead/controllers/changelog_ui.py (+2/-2) loggerhead/controllers/revision_ui.py (+4/-4) loggerhead/load_test.py (+4/-2) loggerhead/templatefunctions.py (+0/-3) loggerhead/tests/test_simple.py (+2/-2) loggerhead/util.py (+2/-0) setup.py (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~cjwatson/loggerhead/remove-simplejson |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ioana Lasc (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Drop dependency on simplejson.
Description of the change
The standard library's json module in Python >= 2.6 will do fine.
To post a comment you must log in.
Revision history for this message
| Ioana Lasc (ilasc) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
