Merge lp://qastaging/~gz/pyjunitxml/source_compat_python_3 into lp://qastaging/pyjunitxml
Proposed by
Martin Packman
| Status: | Merged |
|---|---|
| Approved by: | Robert Collins |
| Approved revision: | 20 |
| Merged at revision: | 19 |
| Proposed branch: | lp://qastaging/~gz/pyjunitxml/source_compat_python_3 |
| Merge into: | lp://qastaging/pyjunitxml |
| Diff against target: |
82 lines (+15/-7) 2 files modified
junitxml/__init__.py (+9/-4) junitxml/tests/test_junitxml.py (+6/-3) |
| To merge this branch: | bzr merge lp://qastaging/~gz/pyjunitxml/source_compat_python_3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Robert Collins | Pending | ||
|
Review via email:
|
|||
Description of the change
Branch to restore Python 3 compatibility. In doing so, needed to back out Vincent's addition of an encode call, but as this was breaking on babune anyway in some circumstances we want a proper fix there anyway (bug 625589 I'll get you soon...) Also does Python 3 style stripping of module name from front of builtin exceptions, as they all moved from 'exceptions' to 'builtins' and that was making the tests cry.
To post a comment you must log in.
Revision history for this message
| Robert Collins (lifeless) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please be editing NEWS.