summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_pydoc.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-09-28 14:48:40 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-09-28 14:48:40 (GMT)
commite56717c3d201db2dadacd20f654d6be7f9ed18ed (patch)
treee0df9e7bf6ab16052edaa32311ab66278bc73404 /Lib/test/test_pydoc.py
parent19f6260710b3d086abcbe400194b203be11b60ab (diff)
parentd8b509b192a67f0f217ae52ed81fc91bc27a1818 (diff)
downloadcpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.zip
cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.gz
cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.bz2
merge heads
Diffstat (limited to 'Lib/test/test_pydoc.py')
-rw-r--r--Lib/test/test_pydoc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
index ae56996..6d3923f 100644
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -238,8 +238,8 @@ def get_pydoc_text(module):
def print_diffs(text1, text2):
"Prints unified diffs for two texts"
# XXX now obsolete, use unittest built-in support
- lines1 = text1.splitlines(True)
- lines2 = text2.splitlines(True)
+ lines1 = text1.splitlines(keepends=True)
+ lines2 = text2.splitlines(keepends=True)
diffs = difflib.unified_diff(lines1, lines2, n=0, fromfile='expected',
tofile='got')
print('\n' + ''.join(diffs))