Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Shortened diff output for unified & context diffs

This commit is contained in:
Edward Loper 2004-08-26 01:31:56 +00:00
parent aacf083388
commit 5662929a42
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/doctest.py
View File

@ -1618,13 +1618,13 @@ class OutputChecker:
got_lines = [l+'\n' for l in got.split('\n')]
# Use difflib to find their differences.
if optionflags & UNIFIED_DIFF:
diff = difflib.unified_diff(want_lines, got_lines, n=2,
fromfile='Expected', tofile='Got')
kind = 'unified diff'
diff = difflib.unified_diff(want_lines, got_lines, n=2)
diff = list(diff)[2:] # strip the diff header
kind = 'unified diff with -expected +actual'
elif optionflags & CONTEXT_DIFF:
diff = difflib.context_diff(want_lines, got_lines, n=2,
fromfile='Expected', tofile='Got')
kind = 'context diff'
diff = difflib.context_diff(want_lines, got_lines, n=2)
diff = list(diff)[2:] # strip the diff header
kind = 'context diff with expected followed by actual'
elif optionflags & NDIFF_DIFF:
engine = difflib.Differ(charjunk=difflib.IS_CHARACTER_JUNK)
diff = list(engine.compare(want_lines, got_lines))

8
Lib/test/test_doctest.py
View File

@ -971,9 +971,7 @@ and actual outputs to be displayed using a unified diff:
Line 2, in f
Failed example:
print '\n'.join('abcdefg')
Differences (unified diff):
--- Expected
+++ Got
Differences (unified diff with -expected +actual):
@@ -1,8 +1,8 @@
a
-B
@ -998,9 +996,7 @@ and actual outputs to be displayed using a context diff:
Line 2, in f
Failed example:
print '\n'.join('abcdefg')
Differences (context diff):
*** Expected
--- Got
Differences (context diff with expected followed by actual):
***************
*** 1,8 ****
a