Merge lp:~gz/brz/unfiltered into lp:brz

[Martin Packman]

Remove some uses of filter that confused things

This started as just running the 2to3 filter fixer, but ended up with a parameter rename (not used outside of tests) and some slight changes to `filter(None, ...)` constructs.

So, now Python 3 compatible but not quite how the fixer envisioned.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/delta.py'
--- breezy/delta.py	2017-05-22 00:56:52 +0000
+++ breezy/delta.py	2017-05-24 20:51:57 +0000
@@ -349,8 +349,9 @@
         reporter.report(file_id, path, versioned_change, renamed, modified,
                         exe_change, kind)
 
-def report_delta(to_file, delta, short_status=False, show_ids=False, 
-         show_unchanged=False, indent='', filter=None, classify=True):
+
+def report_delta(to_file, delta, short_status=False, show_ids=False,
+        show_unchanged=False, indent='', predicate=None, classify=True):
     """Output this delta in status-like form to to_file.
 
     :param to_file: A file-like object where the output is displayed.
@@ -366,7 +367,7 @@
     :param indent: Added at the beginning of all output lines (for merged
         revisions).
 
-    :param filter: A callable receiving a path and a file id and
+    :param predicate: A callable receiving a path and a file id and
         returning True if the path should be displayed.
 
     :param classify: Add special symbols to indicate file kind.
@@ -417,7 +418,7 @@
 
             for item in files:
                 path, file_id, kind = item[:3]
-                if (filter is not None and not filter(path, file_id)):
+                if (predicate is not None and not predicate(path, file_id)):
                     continue
                 if not header_shown and not short_status:
                     to_file.write(indent + long_status_name + ':\n')

=== modified file 'breezy/log.py'
--- breezy/log.py	2017-05-24 20:51:57 +0000
+++ breezy/log.py	2017-05-24 20:51:57 +0000
@@ -889,7 +889,7 @@
     return True
 
 def _match_any_filter(strings, res):
-    return any([filter(None, map(re.search, strings)) for re in res])
+    return any(re.search(s) for re in res for s in strings)
 
 def _make_delta_filter(branch, generate_delta, search, log_rev_iterator,
     fileids=None, direction='reverse'):

=== modified file 'breezy/tests/http_server.py'
--- breezy/tests/http_server.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/http_server.py	2017-05-24 20:51:57 +0000
@@ -342,9 +342,8 @@
         path = posixpath.normpath(urlutils.unquote(path))
         path = path.decode('utf-8')
         words = path.split('/')
-        words = filter(None, words)
         path = self._cwd
-        for num, word in enumerate(words):
+        for num, word in enumerate(w for w in words if w):
             if num == 0:
                 drive, word = os.path.splitdrive(word)
             head, word = os.path.split(word)

=== modified file 'breezy/tests/test_delta.py'
--- breezy/tests/test_delta.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/test_delta.py	2017-05-24 20:51:57 +0000
@@ -22,7 +22,7 @@
     tests,
     )
 from ..sixish import (
-    BytesIO,
+    StringIO,
     )
 
 
@@ -227,7 +227,7 @@
 class TestChangesFrom(tests.TestCaseWithTransport):
 
     def show_string(self, delta, *args,  **kwargs):
-        to_file = BytesIO()
+        to_file = StringIO()
         _mod_delta.report_delta(to_file, delta, *args, **kwargs)
         return to_file.getvalue()
 
@@ -319,47 +319,47 @@
         d = wt.changes_from(repo.revision_tree(_mod_revision.NULL_REVISION))
         return d, long_status, short_status
 
-    def test_delta_show_short_status_no_filter(self):
+    def test_short_status(self):
         d, long_status, short_status = self._get_delta()
-        out = BytesIO()
+        out = StringIO()
         _mod_delta.report_delta(out, d, short_status=True)
         self.assertEqual(short_status, out.getvalue())
 
-    def test_delta_show_long_status_no_filter(self):
+    def test_long_status(self):
         d, long_status, short_status = self._get_delta()
-        out = BytesIO()
+        out = StringIO()
         _mod_delta.report_delta(out, d, short_status=False)
         self.assertEqual(long_status, out.getvalue())
 
-    def test_delta_show_no_filter(self):
+    def test_predicate_always(self):
         d, long_status, short_status = self._get_delta()
-        out = BytesIO()
-        def not_a_filter(path, file_id):
+        out = StringIO()
+        def always(path, file_id):
             return True
-        _mod_delta.report_delta(out, d, short_status=True, filter=not_a_filter)
+        _mod_delta.report_delta(out, d, short_status=True, predicate=always)
         self.assertEqual(short_status, out.getvalue())
 
-    def test_delta_show_short_status_single_file_filter(self):
+    def test_short_status_path_predicate(self):
         d, long_status, short_status = self._get_delta()
-        out = BytesIO()
+        out = StringIO()
         def only_f2(path, file_id):
             return path == 'f2'
-        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2)
+        _mod_delta.report_delta(out, d, short_status=True, predicate=only_f2)
         self.assertEqual("A  f2\n", out.getvalue())
 
-    def test_delta_show_long_status_single_file_filter(self):
+    def test_long_status_path_predicate(self):
         d, long_status, short_status = self._get_delta()
-        out = BytesIO()
+        out = StringIO()
         def only_f2(path, file_id):
             return path == 'f2'
-        _mod_delta.report_delta(out, d, short_status=False, filter=only_f2)
+        _mod_delta.report_delta(out, d, short_status=False, predicate=only_f2)
         self.assertEqual("added:\n  f2\n", out.getvalue())
 
-    def test_delta_show_short_status_single_file_id_filter(self):
+    def test_long_status_id_predicate(self):
         d, long_status, short_status = self._get_delta()
-        out = BytesIO()
+        out = StringIO()
         def only_f2_id(path, file_id):
             return file_id == 'f2-id'
-        _mod_delta.report_delta(out, d, short_status=True, filter=only_f2_id)
-        self.assertEqual("A  f2\n", out.getvalue())
+        _mod_delta.report_delta(out, d, predicate=only_f2_id)
+        self.assertEqual("added:\n  f2\n", out.getvalue())
 

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-05-24 00:57:47 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-05-24 20:51:57 +0000
@@ -55,6 +55,9 @@
  * Signature of ``load_tests`` used by ``TestLoader`` changed to be
    compatible with standard libarary unittest.  (Martin Packman)
 
+ * Renamed ``breezy.delta.report_delta`` parameter ``filter=`` to
+   ``predicate=``. (Martin Packman)
+
 Internals
 *********