[meld: 3/7] Merge branch 'master' into dirdiff.apply_text_filters

[Kai Willadsen <kaiw src gnome org>]

commit 4a8842897dcce4587e72cc95c480a8824d57a538
Merge: 83d33c7d 28a0c466
Author: hugosenari <hugosenari gmail com>
Date:   Thu Jul 12 00:27:43 2018 -0300

    Merge branch 'master' into dirdiff.apply_text_filters

 meld/dirdiff.py                 |  8 +++--
 test/dirdiff/__init__.py        |  0
 test/dirdiff/fixture.py         | 72 ++++++++++++++++++++++++++++++++++++++
 test/dirdiff/test_files_same.py | 76 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+), 3 deletions(-)
---
diff --cc meld/dirdiff.py
index 6c9826ea,f93c33ca..a206c4c3
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@@ -189,8 -190,8 +190,9 @@@ def _files_same(files, regexes, compari
          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 apply_text_filters:
 -            contents = [misc.apply_text_filters(c, regexes) for c in contents]
++            for regex in regexes:
++                contents = (regex.sub(b'', c) for c in contents)
  
          result = SameFiltered if all_same(contents) else Different