Merge lp://staging/~cjwatson/storm/py3-doctest into lp://staging/storm
Proposed by
Colin Watson
Status: | Merged |
---|---|
Merged at revision: | 513 |
Proposed branch: | lp://staging/~cjwatson/storm/py3-doctest |
Merge into: | lp://staging/storm |
Diff against target: |
400 lines (+120/-67) 3 files modified
tests/infoheritance.txt (+12/-6) tests/tutorial.txt (+101/-57) tests/zope/README.txt (+7/-4) |
To merge this branch: | bzr merge lp://staging/~cjwatson/storm/py3-doctest |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kristian Glass (community) | Approve | ||
Storm Developers | Pending | ||
Review via email: mp+371161@code.staging.launchpad.net |
Commit message
Adjust doctests for text repr changes in Python 3.
Description of the change
None of these doctests need to care about the fine details of str vs. Unicode in Python 2 (that sort of thing is tested more specifically in unit tests), and in Python 3 the repr of a text string is '...' rather than u'...'. Rearrange the doctests to tolerate this.
To post a comment you must log in.