Merge lp:~vila/bzr/1303879-py27-issues into lp:bzr
Proposed by
Vincent Ladeuil
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6593 |
Proposed branch: | lp:~vila/bzr/1303879-py27-issues |
Merge into: | lp:bzr |
Diff against target: |
223 lines (+89/-49) 4 files modified
bzrlib/email_message.py (+1/-1) bzrlib/tests/test_email_message.py (+74/-46) bzrlib/tests/test_osutils.py (+8/-2) doc/en/release-notes/bzr-2.7.txt (+6/-0) |
To merge this branch: | bzr merge lp:~vila/bzr/1303879-py27-issues |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Starr-Bochicchio | Approve | ||
bzr-core | Pending | ||
Review via email: mp+214896@code.launchpad.net |
Commit message
Fix python-2.7.6 test failures.
Description of the change
python 2.7.6 introduced a minor incompatible change in the email module. Some tests were relying on as_string() to get a representation of the email message. A final new line is now appended there...
A bug has also been fixed in python 2.7.6 ntpath.py module and some of our tests runs on all platforms and needed to be fixed.
None of those changes affect bzr itself, only its tests.
This has been tested on trusty and saucy to make sure the tests pass for all python versions.
To post a comment you must log in.
Thanks for running this down. It looks good to me. I ran the test suite on Debian sid for good measure as it had been failing there as well. All tests were successful.