Merge lp://staging/~jseutter/testtools/py3 into lp://staging/~testtools-committers/testtools/trunk
Proposed by
Jerry Seutter
| Status: | Rejected |
|---|---|
| Rejected by: | Jonathan Lange |
| Proposed branch: | lp://staging/~jseutter/testtools/py3 |
| Merge into: | lp://staging/~testtools-committers/testtools/trunk |
| Diff against target: |
78 lines (+7/-21) 3 files modified
setup.py (+5/-2) testtools/_compat2x.py (+0/-17) testtools/compat.py (+2/-2) |
| To merge this branch: | bzr merge lp://staging/~jseutter/testtools/py3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Barry Warsaw | Pending | ||
| testtools committers | Pending | ||
|
Review via email:
|
|||
Description of the change
This change adds support for building and installing using python 3. Previously this package could be used in both python 2 and python 3, but a "python setup.py install" using python 3 would fail when trying to compile _compat2x.py.
get_revno() will now silently fail if bzrlib is not present, as bzrlib is not yet available in python 3.
The diff is a little strange because I removed _compat2x.py and later added it back in. I added brackets around the raise line:
raise (exc_class, exc_obj, exc_tb)
To post a comment you must log in.
Revision history for this message
| Robert Collins (lifeless) wrote | # |
Revision history for this message
| Jonathan Lange (jml) wrote | # |
Unmerged revisions
- 264. By Jerry Seutter
-
Adding back in python 2 support.
- 263. By Jerry Seutter
-
Adding back in python 2 compatibility.
- 262. By Jerry Seutter
-
Improved handling when bzrlib is missing, as is the case with Python 3.
- 261. By Jerry Seutter
-
python3 setup.py install now works.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
You've done something odd in your branch - _compat is deleted and
readded. You may want to uncommit back before you did that and
recommit without the mistake.
-Rob