diff options
| -rw-r--r-- | Lib/doctest.py | 12 | ||||
| -rw-r--r-- | Lib/test/test_doctest.py | 8 |
2 files changed, 8 insertions, 12 deletions
diff --git a/Lib/doctest.py b/Lib/doctest.py index dfa1848..9a88b7a 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -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)) diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 7884c04..29c3ec2 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -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 |