Fix linting issues

... which came with the new flake8 version. modified: src/Products/PluginIndexes/CompositeIndex/tests/testCompositeIndex.py modified: src/Products/ZCTextIndex/BaseIndex.py modified: src/Products/ZCTextIndex/RiceCode.py modified: src/Products/ZCatalog/ZCatalog.py
zopefoundation · May 19, 2020 · c4b1a6b · c4b1a6b
1 parent bf97828
commit c4b1a6b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/Products/PluginIndexes/CompositeIndex/tests/testCompositeIndex.py b/src/Products/PluginIndexes/CompositeIndex/tests/testCompositeIndex.py
@@ -296,12 +296,12 @@ def profileSearch(query, warmup=False, verbose=False):
                              len(res1), len(res2), query))
             self.assertEqual(res1, res2)
 
-        for l in lengths:
+        for length in lengths:
             self.clearIndexes()
             logger.info('************************************\n'
-                        'indexing %s objects', l)
+                        'indexing %s objects', length)
 
-            for i in range(l):
+            for i in range(length):
                 name = str(i)
                 obj = RandomTestObject(name)
                 self.populateIndexes(i, obj)

diff --git a/src/Products/ZCTextIndex/BaseIndex.py b/src/Products/ZCTextIndex/BaseIndex.py
@@ -50,7 +50,7 @@ def scaled_int(f, scale=SCALE_FACTOR):
     return int(f * scale + 0.5)
 
 
-def unique(l):
+def unique(l):  # noqa: E741
     """Return a list of the unique elements in l."""
     return IITreeSet(l).keys()
 

diff --git a/src/Products/ZCTextIndex/RiceCode.py b/src/Products/ZCTextIndex/RiceCode.py
@@ -155,15 +155,15 @@ def __setstate__(self, value):
         self.bits = bits
 
 
-def encode(m, l):
+def encode(m, l):  # noqa: E741
     c = RiceCode(m)
     for elt in l:
         c.append(elt)
     assert c.tolist() == l
     return c
 
 
-def encode_deltas(l):
+def encode_deltas(l):  # noqa: E741
     if len(l) == 1:
         return l[0], []
     deltas = RiceCode(6)

diff --git a/src/Products/ZCatalog/ZCatalog.py b/src/Products/ZCatalog/ZCatalog.py
@@ -727,9 +727,8 @@ def ZopeFindAndApply(self, obj, obj_ids=None, obj_metatypes=None,
                          or expr_match(ob, obj_expr))
                     and (not obj_mtime
                          or mtime_match(ob, obj_mtime, obj_mspec))
-                    and ((not obj_permission
-                          or not obj_roles)
-                    or role_match(ob, obj_permission, obj_roles))):
+                    and ((not obj_permission or not obj_roles)
+                         or role_match(ob, obj_permission, obj_roles))):
                 if apply_func:
                     apply_func(ob, (apply_path + '/' + p))
                 else: