[JENKINS] - Fix pylint warnings

eea/facetednavigation/caching/cache.py

@@ -1,14 +1,15 @@
 """ Caching
 """
+from zope.event import notify
+from Products.CMFCore.utils import getToolByName
+from eea.facetednavigation.interfaces import IFacetedLayout
 try:
     from eea.cache import event
     InvalidateCacheEvent = event.InvalidateCacheEvent
 except ImportError:
     from eea.facetednavigation.caching.nocache import InvalidateCacheEvent
 
-from zope.event import notify
-from Products.CMFCore.utils import getToolByName
-from eea.facetednavigation.interfaces import IFacetedLayout
+
 #
 # Cache query
 #
@@ -23,6 +24,7 @@ def cacheKeyFacetedNavigation(method, self, *args, **kwargs):
             kwargs, self.request.get('LANGUAGE', 'en'),
             user.getUserName())
 
+
 def cacheCounterKeyFacetedNavigation(method, self, *args, **kwargs):
     """ Generate unique cache id for faceted counter query
     """
@@ -33,6 +35,7 @@ def cacheCounterKeyFacetedNavigation(method, self, *args, **kwargs):
             kwargs, self.request.get('LANGUAGE', 'en'),
             user.getUserName())
 
+
 def cacheTreeKeyFacetedNavigation(method, self, *args, **kwargs):
     """ Generate unique cache id for faceted tree widget
     """
@@ -45,6 +48,7 @@ def cacheTreeKeyFacetedNavigation(method, self, *args, **kwargs):
             kwargs, self.request.get('LANGUAGE', 'en'),
             user.getUserName())
 
+
 def invalidateFacetedCache(obj, evt):
     """ Invalidate faceted navigation cache
     """

eea/facetednavigation/dexterity_support.py

@@ -10,8 +10,7 @@ def _normalize(value):
         """
         if isinstance(value, unicode):
             return value.encode('utf-8')
-        else:
-            return value
+        return value
     #pyflakes
     normalize = _normalize
 else:
@@ -20,5 +19,4 @@ def normalize(value):
         """
         if isinstance(value, str):
             return value.decode('utf-8')
-        else:
-            return value
+        return value

eea/facetednavigation/exportimport/criteria.py

@@ -63,13 +63,13 @@ def _importNode(self, node):
                 # it is used to sort criteria when the criterion is added
                 pos = [s for s in child.getElementsByTagName('property')
                        if s.getAttribute('name') == 'position']
-                position = pos and pos[0].childNodes[0].nodeValue or 'top'
+                position = pos[0].childNodes[0].nodeValue if pos else 'top'
                 sect = [s for s in child.getElementsByTagName('property')
                         if s.getAttribute('name') == 'section']
-                section = sect and sect[0].childNodes[0].nodeValue or 'default'
+                section = sect[0].childNodes[0].nodeValue if sect else 'default'
                 widget = [w for w in child.getElementsByTagName('property')
                         if w.getAttribute('name') == 'widget']
-                widget = widget and widget[0].childNodes[0].nodeValue or 'text'
+                widget = widget[0].childNodes[0].nodeValue if widget else 'text'
                 cid = self.context.add(widget, position, section, _cid_=name)
             except KeyError:
                 # element already exists, we log and we continue

eea/facetednavigation/indexes/language/adapter.py

@@ -61,9 +61,8 @@ def __call__(self, form):
             if not self.widget.default:
                 # "All" languages
                 return {'Language': self.all_languages}
-            else:
-                # Context or Session language
-                return {'Language': self.language}
+            # Context or Session language
+            return {'Language': self.language}
 
         # Non AJAX call
         if not form.get('ajax', True):

eea/facetednavigation/plonex.py

@@ -1,7 +1,40 @@
 """ Plone X compatibility over time
 """
-from zope.interface import Interface
 from Products.Five.browser import BrowserView
+from zope.interface import Interface
+#
+# Older imports
+#
+try:
+    from zope.browserpage import viewpagetemplatefile
+    ViewPageTemplateFile = viewpagetemplatefile.ViewPageTemplateFile
+except (ImportError, AttributeError):
+    # BBB Plone < 4.3
+    from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+
+try:
+    from zope.pagetemplate import engine
+    TrustedEngine = engine.TrustedEngine
+    TrustedZopeContext = engine.TrustedZopeContext
+except (ImportError, AttributeError):
+    # BBB Plone < 4.3
+    from zope.app.pagetemplate.engine import TrustedEngine, TrustedZopeContext
+
+try:
+    from zope.browsermenu import menu
+    BrowserSubMenuItem = menu.BrowserSubMenuItem
+except (ImportError, AttributeError):
+    # BBB Plone < 4.3
+    from zope.app.publisher.browser.menu import BrowserSubMenuItem
+
+try:
+    from zope.browsermenu import menu
+    BrowserMenu = menu.BrowserMenu
+except (ImportError, AttributeError):
+    # BBB Plone < 4.3
+    from zope.app.publisher.browser.menu import BrowserMenu
+
+
 #
 # plone.protect
 #
@@ -68,38 +101,6 @@ class ISolrSearch(Interface):
         """ collective.solr not installed
         """
 
-#
-# Older imports
-#
-
-try:
-    from zope.browserpage import viewpagetemplatefile
-    ViewPageTemplateFile = viewpagetemplatefile.ViewPageTemplateFile
-except (ImportError, AttributeError):
-    # BBB Plone < 4.3
-    from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-
-try:
-    from zope.pagetemplate import engine
-    TrustedEngine = engine.TrustedEngine
-    TrustedZopeContext = engine.TrustedZopeContext
-except (ImportError, AttributeError):
-    # BBB Plone < 4.3
-    from zope.app.pagetemplate.engine import TrustedEngine, TrustedZopeContext
-
-try:
-    from zope.browsermenu import menu
-    BrowserSubMenuItem = menu.BrowserSubMenuItem
-except (ImportError, AttributeError):
-    # BBB Plone < 4.3
-    from zope.app.publisher.browser.menu import BrowserSubMenuItem
-
-try:
-    from zope.browsermenu import menu
-    BrowserMenu = menu.BrowserMenu
-except (ImportError, AttributeError):
-    # BBB Plone < 4.3
-    from zope.app.publisher.browser.menu import BrowserMenu
 
 __all__ = [
     ViewPageTemplateFile,

eea/facetednavigation/widgets/autocomplete/widget.py

@@ -119,7 +119,7 @@ def __call__(self):
             connection.solrBase + '/suggest', request, connection.formheaders)
         root = etree.fromstring(response.read())
         suggestion = root.xpath("//arr[@name='suggestion']")
-        if len(suggestion):
+        if suggestion:
             suggestions = suggestion[0].findall('str')
             result = [{'id': s.text, 'text': s.text} for s in suggestions]
 

eea/facetednavigation/widgets/boolean/widget.py

@@ -35,7 +35,7 @@ def selected(self):
         """
         return self.default or False
 
-    def vocabulary(self):
+    def vocabulary(self, **kwargs):
         """ Vocabulary
         """
         return [(1, 1)]
@@ -61,5 +61,4 @@ def query(self, form):
 
         if value:
             return {index: True}
-        else:
-            return {}
+        return {}

eea/facetednavigation/widgets/daterange/widget.py

@@ -163,21 +163,18 @@ def js_date_format(self):
         """Return the date format to use with JS datepicker"""
         if self.use_plone_date_format:
             return get_datepicker_date_format(self.request)
-        else:
-            return "yy-mm-dd"
+        return "yy-mm-dd"
 
     @property
     def python_date_format(self):
         """Return the date format to use in python"""
         if self.use_plone_date_format:
             return get_python_date_format(self.request)
-        else:
-            return "%Y-%m-%d"
+        return "%Y-%m-%d"
 
     @property
     def js_language(self):
         """Return the language to use with JS code"""
         if self.use_plone_date_format:
             return self.jq_language()
-        else:
-            return ""
+        return ""

eea/facetednavigation/widgets/path/tree.py

@@ -97,7 +97,7 @@ def tree(self, **kwargs):
 
             node_children = node.get('children', [])
             node_children = [n for n in node_children if strategy.nodeFilter(n)]
-            node_state = len(node_children) and 'closed' or 'leaf'
+            node_state = 'closed' if node_children else 'leaf'
 
             nodes.append({
                 'attributes': {

eea/facetednavigation/widgets/resultsfilter/widget.py

@@ -3,7 +3,6 @@
 import logging
 from zope.interface import implementer
 from zope.interface import Interface
-from Products.CMFCore.utils import getToolByName
 from eea.facetednavigation.widgets import TrustedEngine
 from eea.facetednavigation.widgets import TrustedZopeContext
 from eea.facetednavigation.widgets import ViewPageTemplateFile
@@ -14,6 +13,7 @@
     DefaultSchemata,
     LayoutSchemata,
 )
+from Products.CMFCore.utils import getToolByName
 try:
     from Products.Archetypes.interfaces import IBaseObject
 except ImportError:

eea/facetednavigation/widgets/sorting/widget.py

@@ -1,17 +1,14 @@
 """ Sorting widget
 """
+from zope.component import getUtility
 from plone.app.querystring.interfaces import IQuerystringRegistryReader
 from plone.registry.interfaces import IRegistry
-from zope.component import getUtility
-
-from Products.CMFCore.utils import getToolByName
-
 from eea.facetednavigation.widgets import ViewPageTemplateFile
 from eea.facetednavigation.widgets.sorting.interfaces import DefaultSchemata
 from eea.facetednavigation.widgets.sorting.interfaces import LayoutSchemata
 from eea.facetednavigation.widgets.widget import Widget as AbstractWidget
 from eea.facetednavigation import EEAMessageFactory as _
-
+from Products.CMFCore.utils import getToolByName
 try:
     from Products.ATContentTypes.criteria import _criterionRegistry
     HAS_ATCT = True
@@ -49,8 +46,8 @@ def query(self, form):
 
         if self.hidden:
             default = self.default
-            sort_on = len(default) > 0 and default[0] or None
-            reverse = len(default) > 1 and default[1] or False
+            sort_on = default[0] if default else None
+            reverse = default[1] if len(default) > 1 else False
         else:
             sort_on = form.get(self.data.getId(), '')
             reverse = form.get('reversed', False)

eea/facetednavigation/widgets/storage.py

@@ -49,7 +49,7 @@ def hidden(self, value):
         """
         if value in (u'0', u'False', u'false', u'none', u'None'):
             value = False
-        self._hidden = value and True or False
+        self._hidden = True if value else False
 
     def update(self, **kwargs):
         """ Update criterion properties

eea/facetednavigation/widgets/tagscloud/widget.py

@@ -57,9 +57,10 @@ def cut_text(self, text='', maxchars=0):
             return text
         return '%s...' % text[0:maxchars]
 
-    def vocabulary(self, oll=False, **kwargs):
+    def vocabulary(self, **kwargs):
         """ Return a limited number of results
         """
+        oll = kwargs.get('oll', False)
         voc = list(super(Widget, self).vocabulary())
 
         if oll:

eea/facetednavigation/widgets/tal/widget.py

@@ -3,14 +3,14 @@
 # Python
 import logging
 from zope.interface import Interface
-from Products.CMFCore.utils import getToolByName
 from eea.facetednavigation.widgets import ViewPageTemplateFile
 from eea.facetednavigation.widgets import TrustedEngine
 from eea.facetednavigation.widgets import TrustedZopeContext
 from eea.facetednavigation.widgets.tal.interfaces import DefaultSchemata
 from eea.facetednavigation.widgets.tal.interfaces import LayoutSchemata
 from eea.facetednavigation.widgets.widget import Widget as AbstractWidget
 from eea.facetednavigation import EEAMessageFactory as _
+from Products.CMFCore.utils import getToolByName
 try:
     from Products.Archetypes.interfaces import IBaseObject
 except ImportError:

eea/facetednavigation/widgets/widget.py

@@ -4,14 +4,14 @@
 import logging
 import operator
 from zope import interface
-from z3c.form.group import GroupForm
-from z3c.form.form import Form
-from z3c.form.interfaces import IGroup
 from zope.component import queryMultiAdapter
 from zope.i18n import translate
 from zope.i18nmessageid.message import Message
 from zope.schema.interfaces import IVocabularyFactory
 from zope.component import queryUtility
+from z3c.form.group import GroupForm
+from z3c.form.form import Form
+from z3c.form.interfaces import IGroup
 from BTrees.IIBTree import weightedIntersection, IISet
 
 from plone.i18n.normalizer import urlnormalizer as normalizer
@@ -130,23 +130,24 @@ def translate(self, message):
         """
         if not message:
             return ''
-        elif isinstance(message, Message):
+
+        if isinstance(message, Message):
             # message is an i18n message
             return translate(message, context=self.request)
-        else:
-            # message is a simple msgid
-            for domain in ['eea', 'plone']:
-                if isinstance(message, str):
-                    try:
-                        message = message.decode('utf-8')
-                    except Exception, err:
-                        logger.exception(err)
-                        continue
-
-                value = translate(message, domain=domain, context=self.request)
-                if value != message:
-                    return value
-            return message
+
+        # message is a simple msgid
+        for domain in ['eea', 'plone']:
+            if isinstance(message, str):
+                try:
+                    message = message.decode('utf-8')
+                except Exception, err:
+                    logger.exception(err)
+                    continue
+
+            value = translate(message, domain=domain, context=self.request)
+            if value != message:
+                return value
+        return message
 
     def cleanup(self, string):
         """ Quote string