diff options
| author | Tim Peters <tim.peters@gmail.com> | 2004-08-29 19:33:36 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2004-08-29 19:33:36 (GMT) |
| commit | afb5f9421719e7c7ada1a236bb226c9f84eaf880 (patch) | |
| tree | ed8a368f3e49e2ce6f4f22a3e5cf5400abfb21bc /Lib/test/test_difflib.py | |
| parent | 45e77c55ff3b2a3e0d6ffdd85d4fe0d61e5ff210 (diff) | |
| download | cpython-afb5f9421719e7c7ada1a236bb226c9f84eaf880.zip cpython-afb5f9421719e7c7ada1a236bb226c9f84eaf880.tar.gz cpython-afb5f9421719e7c7ada1a236bb226c9f84eaf880.tar.bz2 | |
Reverting whitespace normalization. test_difflib fails with it -- the
test depends on invisible trailing whitespace in .py files. The author will
have to repair that.
Diffstat (limited to 'Lib/test/test_difflib.py')
| -rw-r--r-- | Lib/test/test_difflib.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/Lib/test/test_difflib.py b/Lib/test/test_difflib.py index c0bf66e..37fc548 100644 --- a/Lib/test/test_difflib.py +++ b/Lib/test/test_difflib.py @@ -46,7 +46,7 @@ patch914575_to2 = """ \tLine 2: preceeded by from:[sstt] to:[sssst] Line 3: preceeded by from:[sstst] to:[ssssss] Line 4: has from:[sst] to:[sss] after : -Line 5: has from:[t] to:[ss] at end +Line 5: has from:[t] to:[ss] at end """ patch914575_from3 = """line 0 @@ -54,9 +54,9 @@ patch914575_from3 = """line 0 line 1 line 2 line 3 -line 4 changed -line 5 changed -line 6 changed +line 4 changed +line 5 changed +line 6 changed line 7 line 8 subtracted line 9 @@ -71,9 +71,9 @@ patch914575_to3 = """line 0 line 1 line 2 added line 3 -line 4 chanGEd -line 5a chanGed -line 6a changEd +line 4 chanGEd +line 5a chanGed +line 6a changEd line 7 line 8 line 9 @@ -102,21 +102,21 @@ class TestSFpatches(unittest.TestCase): i = difflib.HtmlDiff() j = difflib.HtmlDiff(tabsize=2) k = difflib.HtmlDiff(wrapcolumn=14) - + full = i.make_file(f1a,t1a,'from','to',context=False,numlines=5) tables = '\n'.join( [ - '<h2>Context (first diff within numlines=5(default))</h2>', + '<h2>Context (first diff within numlines=5(default))</h2>', i.make_table(f1a,t1a,'from','to',context=True), - '<h2>Context (first diff after numlines=5(default))</h2>', + '<h2>Context (first diff after numlines=5(default))</h2>', i.make_table(f1b,t1b,'from','to',context=True), - '<h2>Context (numlines=6)</h2>', + '<h2>Context (numlines=6)</h2>', i.make_table(f1a,t1a,'from','to',context=True,numlines=6), - '<h2>Context (numlines=0)</h2>', + '<h2>Context (numlines=0)</h2>', i.make_table(f1a,t1a,'from','to',context=True,numlines=0), - '<h2>Same Context</h2>', + '<h2>Same Context</h2>', i.make_table(f1a,f1a,'from','to',context=True), - '<h2>Same Full</h2>', + '<h2>Same Full</h2>', i.make_table(f1a,f1a,'from','to',context=False), '<h2>Empty Context</h2>', i.make_table([],[],'from','to',context=True), @@ -139,8 +139,8 @@ class TestSFpatches(unittest.TestCase): #f.write(actual) #f.close() expect = open(findfile('test_difflib_expect.html')).read() - - + + self.assertEqual(actual,expect) Doctests = doctest.DocTestSuite(difflib) |