Skip to content

Commit 74ee2a9

Browse files
committed
issue: #dirdiff.apply_text_filters - Apply regex.sub instead of apply_text_filters; commit: avoid do something with third file if first and second differ
1 parent 4a88428 commit 74ee2a9

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

meld/dirdiff.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ def _files_same(files, regexes, comparison_args):
183183
result = Same
184184

185185
if result == Different and need_contents:
186-
contents = [b"".join(c) for c in contents]
186+
contents = (b"".join(c) for c in contents)
187187
# For probable text files, discard newline differences to match
188188
if ignore_blank_lines:
189-
contents = [remove_blank_lines(c) for c in contents]
189+
contents = (remove_blank_lines(c) for c in contents)
190190
else:
191-
contents = [b"\n".join(c.splitlines()) for c in contents]
191+
contents = (b"\n".join(c.splitlines()) for c in contents)
192192

193193
if apply_text_filters:
194194
for regex in regexes:

0 commit comments

Comments
 (0)