Merge lp://staging/~cjwatson/storm/py3-integer-types into lp://staging/storm
Proposed by
Colin Watson
| Status: | Merged |
|---|---|
| Merged at revision: | 498 |
| Proposed branch: | lp://staging/~cjwatson/storm/py3-integer-types |
| Merge into: | lp://staging/storm |
| Diff against target: |
248 lines (+40/-18) 8 files modified
dev/ubuntu-deps (+5/-4) setup.py (+1/-0) storm/expr.py (+4/-2) storm/store.py (+3/-1) storm/variables.py (+7/-5) tests/expr.py (+9/-2) tests/store/base.py (+4/-2) tests/variables.py (+7/-2) |
| To merge this branch: | bzr merge lp://staging/~cjwatson/storm/py3-integer-types |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Adam Collard (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Handle Python 3's int/long changes (PEP 237).
Description of the change
This introduces a run-time dependency on six. At the moment this is used quite lightly, but we'll need more from it as the Python 3 port progresses, so I think it makes more sense to use it than to reinvent it, especially as it's already a very popular package.
To post a comment you must log in.
Revision history for this message
| Colin Watson (cjwatson) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good - can I ask that the ubuntu-deps change be sorted though, (i.e. insert after psycopg2)