[meld: 4/7] issue: #dirdiff.apply_text_filters - Apply regex.sub instead of apply_text_filters; commit: avoid do



commit 74ee2a9acb0ed1f760c5df72710d7c0128e767fc
Author: hugosenari <hugosenari gmail com>
Date:   Thu Jul 12 00:31:13 2018 -0300

    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

 meld/dirdiff.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index a206c4c3..c625b1e0 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -183,12 +183,12 @@ def _files_same(files, regexes, comparison_args):
         result = Same
 
     if result == Different and need_contents:
-        contents = [b"".join(c) for c in contents]
+        contents = (b"".join(c) for c in contents)
         # For probable text files, discard newline differences to match
         if ignore_blank_lines:
-            contents = [remove_blank_lines(c) for c in contents]
+            contents = (remove_blank_lines(c) for c in contents)
         else:
-            contents = [b"\n".join(c.splitlines()) for c in contents]
+            contents = (b"\n".join(c.splitlines()) for c in contents)
 
         if apply_text_filters:
             for regex in regexes:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]