Merge lp://staging/~cjwatson/storm/six-moves into lp://staging/storm
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Merged at revision: | 507 |
| Proposed branch: | lp://staging/~cjwatson/storm/six-moves |
| Merge into: | lp://staging/storm |
| Diff against target: |
185 lines (+18/-14) 8 files modified
storm/uri.py (+1/-1) storm/variables.py (+1/-1) tests/databases/base.py (+2/-1) tests/databases/proxy.py (+6/-5) tests/mocker.py (+3/-2) tests/store/base.py (+1/-1) tests/variables.py (+1/-1) tests/wsgi.py (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~cjwatson/storm/six-moves |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Simon Poirier (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Import from six.moves where appropriate.
Description of the change
There are still a few imports that won't work on Python 3 and are a bit less trivial (cStringIO), but this at least lets the test suite just about start up.
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1