Fix code-analysis

buildout.cfg

@@ -41,6 +41,7 @@ directory = ${buildout:directory}/src/collective
 flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
 flake8-max-complexity = 18
 flake8-max-line-length = 120
+flake8-ignore = W606, B902
 flake8-extensions =
     flake8-blind-except
     flake8-debugger

src/collective/iconifiedcategory/adapter.py

@@ -15,7 +15,6 @@
 from collective.iconifiedcategory.content.subcategory import ISubcategory
 from collective.iconifiedcategory.interfaces import IIconifiedPreview
 from collective.iconifiedcategory.utils import _modified
-from datetime import datetime
 from plone import api
 from plone.app.contenttypes.interfaces import IFile
 from plone.app.contenttypes.interfaces import IImage

src/collective/iconifiedcategory/browser/views.py

@@ -57,8 +57,7 @@ def __call__(self, portal_type=None, show_nothing=True, check_can_view=False):
         return super(CategorizedChildView, self).__call__()
 
     def has_elements_to_show(self):
-        return ('categorized_elements' in self.context.__dict__ and
-                len(self.categorized_elements) > 0)
+        return ('categorized_elements' in self.context.__dict__ and len(self.categorized_elements) > 0)
 
     def categories_infos(self):
         infos = [(e['category_uid'], {'id': e['category_id'],

src/collective/iconifiedcategory/content/category.py

@@ -30,6 +30,8 @@ class ICategory(IFolder, ICategorize, IICImageScaleTraversable):
                       u'could be not optimal.'),
         required=True,
     )
+
+
 alsoProvides(ICategory['icon'], IPrimaryField)
 
 

src/collective/iconifiedcategory/tests/test_setup.py

@@ -23,8 +23,7 @@ def test_product_installed(self):
 
     def test_browserlayer(self):
         """Test that ICollectiveIconifiedCategoryLayer is registered."""
-        from collective.iconifiedcategory.interfaces import (
-            ICollectiveIconifiedCategoryLayer)
+        from collective.iconifiedcategory.interfaces import ICollectiveIconifiedCategoryLayer
         from plone.browserlayer import utils
         self.assertIn(ICollectiveIconifiedCategoryLayer,
                       utils.registered_layers())

src/collective/iconifiedcategory/utils.py

@@ -269,6 +269,31 @@ def _categorized_elements(context):
     )
 
 
+def _check_filters(infos, filters):
+    """ """
+    keep = True
+    for k, v in filters.items():
+        # manage case when stored value is a list or not
+        stored_value = infos[k]
+        if not hasattr(stored_value, '__iter__'):
+            stored_value = (stored_value, )
+        if v not in stored_value:
+            keep = False
+            break
+    return keep
+
+
+def _get_adapter(context, obj, adapter):
+    """ """
+    if adapter is None:
+        adapter = getMultiAdapter(
+            (context, context.REQUEST, obj),
+            IIconifiedContent)
+    else:
+        adapter.categorized_obj = obj
+    return adapter
+
+
 def get_categorized_elements(context,
                              result_type='dict',
                              portal_type=None,
@@ -285,29 +310,6 @@ def get_categorized_elements(context,
        available filters are values stored in categorized_elements.
        If p_check_can_view is True, then the IIconifiedContent.can_view
        check will be called."""
-    def _check_filters(infos):
-        """ """
-        keep = True
-        for k, v in filters.items():
-            # manage case when stored value is a list or not
-            stored_value = infos[k]
-            if not hasattr(stored_value, '__iter__'):
-                stored_value = (stored_value, )
-            if v not in stored_value:
-                keep = False
-                break
-        return keep
-
-    def _get_adapter(parent, obj, adapter):
-        """ """
-        if adapter is None:
-            adapter = getMultiAdapter(
-                (context, context.REQUEST, obj),
-                IIconifiedContent)
-        else:
-            adapter.categorized_obj = obj
-        return adapter
-
     elements = None
     if caching:
         # in some cases like in tests, request can not be retrieved
@@ -334,9 +336,9 @@ def _get_adapter(parent, obj, adapter):
         for uid, infos in categorized_elements.items():
             if (uids and uid not in uids) or \
                (portal_type and infos['portal_type'] != portal_type) or \
-               not _check_filters(infos) or \
-               (infos['confidential'] and
-                    not set(infos['allowedRolesAndUsers']).intersection(current_user_allowedRolesAndUsers)):
+               not _check_filters(infos, filters) or \
+               (infos['confidential'] and not set(infos['allowedRolesAndUsers'])
+                   .intersection(current_user_allowedRolesAndUsers)):
                 continue
 
             obj = context.get(infos['id'])