mirror of https://github.com/python/cpython
Merged revisions 76464 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76464 | senthil.kumaran | 2009-11-24 00:11:31 +0530 (Tue, 24 Nov 2009) | 4 lines Fix for issue1488943 - difflib.Differ() doesn't always add hints for tab characters. ........
This commit is contained in:
parent
2002eeabaf
commit
4702aef1ad
|
@ -1061,20 +1061,21 @@ class Differ:
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
>>> d = Differ()
|
>>> d = Differ()
|
||||||
>>> results = d._qformat('\tabcDefghiJkl\n', '\t\tabcdefGhijkl\n',
|
>>> results = d._qformat('\tabcDefghiJkl\n', '\tabcdefGhijkl\n',
|
||||||
... ' ^ ^ ^ ', '+ ^ ^ ^ ')
|
... ' ^ ^ ^ ', ' ^ ^ ^ ')
|
||||||
>>> for line in results: print repr(line)
|
>>> for line in results: print repr(line)
|
||||||
...
|
...
|
||||||
'- \tabcDefghiJkl\n'
|
'- \tabcDefghiJkl\n'
|
||||||
'? \t ^ ^ ^\n'
|
'? \t ^ ^ ^\n'
|
||||||
'+ \t\tabcdefGhijkl\n'
|
'+ \tabcdefGhijkl\n'
|
||||||
'? \t ^ ^ ^\n'
|
'? \t ^ ^ ^\n'
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Can hurt, but will probably help most of the time.
|
# Can hurt, but will probably help most of the time.
|
||||||
common = min(_count_leading(aline, "\t"),
|
common = min(_count_leading(aline, "\t"),
|
||||||
_count_leading(bline, "\t"))
|
_count_leading(bline, "\t"))
|
||||||
common = min(common, _count_leading(atags[:common], " "))
|
common = min(common, _count_leading(atags[:common], " "))
|
||||||
|
common = min(common, _count_leading(btags[:common], " "))
|
||||||
atags = atags[common:].rstrip()
|
atags = atags[common:].rstrip()
|
||||||
btags = btags[common:].rstrip()
|
btags = btags[common:].rstrip()
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,14 @@ class TestSFbugs(unittest.TestCase):
|
||||||
diff_gen = difflib.unified_diff([], [])
|
diff_gen = difflib.unified_diff([], [])
|
||||||
self.assertRaises(StopIteration, diff_gen.next)
|
self.assertRaises(StopIteration, diff_gen.next)
|
||||||
|
|
||||||
|
def test_added_tab_hint(self):
|
||||||
|
# Check fix for bug #1488943
|
||||||
|
diff = list(difflib.Differ().compare(["\tI am a buggy"],["\t\tI am a bug"]))
|
||||||
|
self.assertEqual("- \tI am a buggy", diff[0])
|
||||||
|
self.assertEqual("? --\n", diff[1])
|
||||||
|
self.assertEqual("+ \t\tI am a bug", diff[2])
|
||||||
|
self.assertEqual("? +\n", diff[3])
|
||||||
|
|
||||||
patch914575_from1 = """
|
patch914575_from1 = """
|
||||||
1. Beautiful is beTTer than ugly.
|
1. Beautiful is beTTer than ugly.
|
||||||
2. Explicit is better than implicit.
|
2. Explicit is better than implicit.
|
||||||
|
|
|
@ -258,6 +258,8 @@ Core and Builtins
|
||||||
Library
|
Library
|
||||||
-------
|
-------
|
||||||
|
|
||||||
|
- Issue #1488943: difflib.Differ() doesn't always add hints for tab characters
|
||||||
|
|
||||||
- Issue #5037: Proxy the __unicode__ special method instead to __unicode__
|
- Issue #5037: Proxy the __unicode__ special method instead to __unicode__
|
||||||
instead of __str__.
|
instead of __str__.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue