mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Misc cleanups.

This commit is contained in:
Tim Peters 2004-08-23 21:43:39 +00:00
parent b6a04d687d
commit 3fa8c2079a
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Lib/doctest.py
View File

@ -1555,7 +1555,7 @@ def check_output(self, want, got, optionflags):
# This flag causes doctest to ignore any differences in the # This flag causes doctest to ignore any differences in the
# contents of whitespace strings. Note that this can be used # contents of whitespace strings. Note that this can be used
# in conjunction with the ELLISPIS flag. # in conjunction with the ELLIPSIS flag.
if optionflags & NORMALIZE_WHITESPACE: if optionflags & NORMALIZE_WHITESPACE:
got = ' '.join(got.split()) got = ' '.join(got.split())
want = ' '.join(want.split()) want = ' '.join(want.split())
@ -2435,6 +2435,7 @@ def get(self):
>>> x + y, x * y >>> x + y, x * y
(3, 2) (3, 2)
""", """,
"bool-int equivalence": r""" "bool-int equivalence": r"""
In 2.2, boolean expressions displayed In 2.2, boolean expressions displayed
0 or 1. By default, we still accept 0 or 1. By default, we still accept
@ -2450,6 +2451,7 @@ def get(self):
>>> 4 > 4 >>> 4 > 4
False False
""", """,
"blank lines": r""" "blank lines": r"""
Blank lines can be marked with <BLANKLINE>: Blank lines can be marked with <BLANKLINE>:
>>> print 'foo\n\nbar\n' >>> print 'foo\n\nbar\n'
@ -2458,22 +2460,23 @@ def get(self):
bar bar
<BLANKLINE> <BLANKLINE>
""", """,
"ellipsis": r"""
If the ellipsis flag is used, then '...' can be used to
elide substrings in the desired output:
>>> print range(1000) #doctest: +ELLIPSIS
[0, 1, 2, ..., 999]
""",
"whitespace normalization": r"""
If the whitespace normalization flag is used, then
differences in whitespace are ignored.
>>> print range(30) #doctest: +NORMALIZE_WHITESPACE
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29]
""",
} }
# "ellipsis": r"""
# If the ellipsis flag is used, then '...' can be used to
# elide substrings in the desired output:
# >>> print range(1000)
# [0, 1, 2, ..., 999]
# """,
# "whitespace normalization": r"""
# If the whitespace normalization flag is used, then
# differences in whitespace are ignored.
# >>> print range(30)
# [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
# 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
# 27, 28, 29]
# """,
# }
def test1(): r""" def test1(): r"""
>>> warnings.filterwarnings("ignore", "class Tester", DeprecationWarning, >>> warnings.filterwarnings("ignore", "class Tester", DeprecationWarning,
@ -2592,11 +2595,6 @@ def test4(): """
""" """
def _test(): def _test():
#import doctest
#doctest.testmod(doctest, verbose=False,
# optionflags=ELLIPSIS | NORMALIZE_WHITESPACE |
# UNIFIED_DIFF)
#print '~'*70
r = unittest.TextTestRunner() r = unittest.TextTestRunner()
r.run(DocTestSuite()) r.run(DocTestSuite())