mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 18:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Example.__init__: this cannot use assert, because that fails to trigger

Browse source 
in a -O run, and so test_doctest was failing under -O.  Simple cause,
simple cure.
This commit is contained in:
Tim Peters 2004-08-04 20:04:32 +00:00
parent 8485b56216
commit 9b625d3037
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/doctest.py
View file

@ -478,8 +478,11 @@ class Example:
""" """
def __init__(self, source, want, lineno): def __init__(self, source, want, lineno):
# Check invariants. # Check invariants.
assert (source[-1:] == '\n') == ('\n' in source[:-1]) if (source[-1:] == '\n') != ('\n' in source[:-1]):
assert want == '' or want[-1] == '\n' raise AssertionError("source must end with newline iff "
"source contains more than one line")
if want and want[-1] != '\n':
raise AssertionError("non-empty want must end with newline")
# Store properties. # Store properties.
self.source = source self.source = source
self.want = want self.want = want

6
Lib/test/test_doctest.py
View file

@ -132,13 +132,13 @@ than one line:
>>> e = doctest.Example('print 1', '1\n', 0) >>> e = doctest.Example('print 1', '1\n', 0)
>>> e = doctest.Example('print 1\n', '1\n', 0) >>> e = doctest.Example('print 1\n', '1\n', 0)
Traceback (most recent call last): Traceback (most recent call last):
AssertionError AssertionError: source must end with newline iff source contains more than one line
>>> # Source spans multiple lines: require terminating newline. >>> # Source spans multiple lines: require terminating newline.
>>> e = doctest.Example('print 1;\nprint 2\n', '1\n2\n', 0) >>> e = doctest.Example('print 1;\nprint 2\n', '1\n2\n', 0)
>>> e = doctest.Example('print 1;\nprint 2', '1\n2\n', 0) >>> e = doctest.Example('print 1;\nprint 2', '1\n2\n', 0)
Traceback (most recent call last): Traceback (most recent call last):
AssertionError AssertionError: source must end with newline iff source contains more than one line
The `want` string should be terminated by a newline, unless it's the The `want` string should be terminated by a newline, unless it's the
empty string: empty string:
@ -146,7 +146,7 @@ empty string:
>>> e = doctest.Example('print 1', '1\n', 0) >>> e = doctest.Example('print 1', '1\n', 0)
>>> e = doctest.Example('print 1', '1', 0) >>> e = doctest.Example('print 1', '1', 0)
Traceback (most recent call last): Traceback (most recent call last):
AssertionError AssertionError: non-empty want must end with newline
>>> e = doctest.Example('print', '', 0) >>> e = doctest.Example('print', '', 0)
""" """