diff options
Diffstat (limited to 'Lib/difflib.py')
| -rw-r--r-- | Lib/difflib.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Lib/difflib.py b/Lib/difflib.py index 4bba9e7..f1f4e62 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1038,11 +1038,9 @@ class Differ: # remaining is that perhaps it was really the case that " volatile" # was inserted after "private". I can live with that <wink>. -import re - -def IS_LINE_JUNK(line, pat=re.compile(r"\s*(?:#\s*)?$").match): +def IS_LINE_JUNK(line, pat=None): r""" - Return True for ignorable line: iff `line` is blank or contains a single '#'. + Return True for ignorable line: if `line` is blank or contains a single '#'. Examples: @@ -1054,6 +1052,11 @@ def IS_LINE_JUNK(line, pat=re.compile(r"\s*(?:#\s*)?$").match): False """ + if pat is None: + # Default: match '#' or the empty string + return line.strip() in '#' + # Previous versions used the undocumented parameter 'pat' as a + # match function. Retain this behaviour for compatibility. return pat(line) is not None def IS_CHARACTER_JUNK(ch, ws=" \t"): @@ -2027,7 +2030,6 @@ class HtmlDiff(object): replace('\1','</span>'). \ replace('\t',' ') -del re def restore(delta, which): r""" |