rattail/appypod-rattail
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

appy.shared.diff: bugfixes.

Browse source
This commit is contained in:
Gaetan Delannay 2012-01-16 15:05:35 +01:00
parent 7d844070df
commit a89d65afc6
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shared/diff.py
View file

@ -333,6 +333,9 @@ class HtmlDiff:
def isSimilar(self, s1, s2): def isSimilar(self, s1, s2):
'''Returns True if strings p_s1 and p_s2 can be considered as '''Returns True if strings p_s1 and p_s2 can be considered as
similar.''' similar.'''
# Bypass the similarity algorithm for strings of length==1. Else, it can
# lead to infinite loops between methods getHtmlDiff and getReplacement.
if (len(s1) == 1) and (len(s2) == 1) and (s1 != s2): return False
ratio = difflib.SequenceMatcher(a=s1.lower(), b=s2.lower()).ratio() ratio = difflib.SequenceMatcher(a=s1.lower(), b=s2.lower()).ratio()
return ratio > self.diffRatio return ratio > self.diffRatio
@ -487,7 +490,7 @@ class HtmlDiff:
i = len(l)-1 i = len(l)-1
while i >= 0: while i >= 0:
if l[i] in self.garbage: del l[i] if l[i] in self.garbage: del l[i]
if sep == '\n': l[i] = l[i].strip() elif sep == '\n': l[i] = l[i].strip()
i -= 1 i -= 1
return l return l