[meld: 6/7] issue: #dirdiff._files_same.mmap - Use mmap for files with size greater than CHUNK_SIZE; commit: rol



commit 971a101fd6de77c8b6b099c6501cbe851eb07eed
Author: hugosenari <hugosenari gmail com>
Date:   Mon Jul 16 01:58:24 2018 -0300

    issue: #dirdiff._files_same.mmap - Use mmap for files with size greater than CHUNK_SIZE; commit: rollback 
apply text filters

 meld/dirdiff.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index 3b83f6cc..ff147a11 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -38,7 +38,7 @@ from meld import tree
 from meld.conf import _
 from meld.iohelpers import trash_or_confirm
 from meld.melddoc import MeldDoc
-from meld.misc import all_same, with_focused_pane
+from meld.misc import all_same, apply_text_filters, with_focused_pane
 from meld.recent import RecentType
 from meld.settings import bind_settings, meldsettings, settings
 from meld.treehelpers import refocus_deleted_path, tree_path_as_tuple
@@ -137,8 +137,8 @@ def _normalize(contents, ignore_blank_lines, regexes = ()):
     else:
         contents = (b"\n".join(c.splitlines()) for c in contents)
 
-    for regex in regexes:
-        contents = (regex.sub(b'', c) for c in contents)
+    if regexes:
+        contents = (apply_text_filters(c, regexes) for c in contents)
 
     return contents
 


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