[Python-checkins] python/dist/src/Lib/test test_difflib.py, 1.12,
1.13
tim_one at users.sourceforge.net
tim_one at users.sourceforge.net
Sun Aug 29 21:33:38 CEST 2004
Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21332/Lib/test
Modified Files:
test_difflib.py
Log Message:
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.
Index: test_difflib.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_difflib.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- test_difflib.py 29 Aug 2004 18:47:31 -0000 1.12
+++ test_difflib.py 29 Aug 2004 19:33:36 -0000 1.13
@@ -46,7 +46,7 @@
\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 @@
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 @@
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 @@
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 @@
#f.write(actual)
#f.close()
expect = open(findfile('test_difflib_expect.html')).read()
-
-
+
+
self.assertEqual(actual,expect)
Doctests = doctest.DocTestSuite(difflib)
More information about the Python-checkins
mailing list