Merge lp://qastaging/~michael.nelson/rnr-server/1268250-changed-timestamp-format into lp://qastaging/rnr-server
Proposed by
Michael Nelson
| Status: | Merged |
|---|---|
| Approved by: | Michael Nelson |
| Approved revision: | 246 |
| Merged at revision: | 245 |
| Proposed branch: | lp://qastaging/~michael.nelson/rnr-server/1268250-changed-timestamp-format |
| Merge into: | lp://qastaging/rnr-server |
| Diff against target: |
103 lines (+61/-2) 2 files modified
src/reviewsapp/api/handlers.py (+60/-1) src/reviewsapp/tests/test_handlers.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~michael.nelson/rnr-server/1268250-changed-timestamp-format |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Use Django 1.3-style timestamp formatting in json results.
Description of the change
The codebase was updated to work with Django 1.5 in April 2013, but never deployed until last Friday. One of the changes as part of that upgrade work, updated a test which actually caught the change in timestamp format.
This branch reverts the change to the unit test, and updates the handler so that it continues to use Django1.3-style timestamps.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM