From: Edward Loper <edloper@gradient.cis.upenn.edu>
Date: Thu, 26 Aug 2004 01:31:56 +0000 (+0000)
Subject: Shortened diff output for unified & context diffs
X-Git-Tag: v2.4a3~108
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5662929a4268efdeed21c45366e6a632926a275f;p=python

Shortened diff output for unified & context diffs
---

diff --git a/Lib/doctest.py b/Lib/doctest.py
index dfa18480a7..9a88b7a880 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 7884c045dd..29c3ec2fe3 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