Merge lp:~jml/testtools/address-0.9.18-release-issues into lp:~testtools-committers/testtools/trunk
Proposed by
Jonathan Lange
Status: | Merged |
---|---|
Merged at revision: | 282 |
Proposed branch: | lp:~jml/testtools/address-0.9.18-release-issues |
Merge into: | lp:~testtools-committers/testtools/trunk |
Diff against target: | 0 lines |
To merge this branch: | bzr merge lp:~jml/testtools/address-0.9.18-release-issues |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman | Approve | ||
Review via email: mp+130557@code.launchpad.net |
Commit message
Fix Python 3 cosmetic errors and include matcher tests in the release
Description of the change
Attacks the cosmetic Python 3.3 errors by sorting dict output.
Includes the matcher tests, allowing the tests to be run from the tarball.
To post a comment you must log in.
Looks good overall.
+ if sys.version_info > (3, 3):
+ return "FileExistsError"
As discussed on IRC, Python 3.3 makes the exception name we should expect platform-dependant, so would be best to allow either using MatchesRegex or similar.
+ if sys.version_info > (3, 3): self._as_ output( "\n%s: " % (error,)), textoutput)
+ error = 'TypeError'
+ else:
+ error = 'SyntaxError'
+ self.assertIn(
Just ran this with the pre-release Python 3.3 I had installed and the test failed. Probably wants the same treatment of just accepting both exception names, rather than using a version check?