flake8

plone · Jul 27, 2014 · f85fa7c · f85fa7c
1 parent a3b7b11
commit f85fa7c
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 127 deletions.
diff --git a/plone/app/viewletmanager/__init__.py b/plone/app/viewletmanager/__init__.py
@@ -1 +0,0 @@
-#

diff --git a/plone/app/viewletmanager/exportimport/__init__.py b/plone/app/viewletmanager/exportimport/__init__.py
@@ -1 +0,0 @@
-#

diff --git a/plone/app/viewletmanager/exportimport/storage.py b/plone/app/viewletmanager/exportimport/storage.py
@@ -108,10 +108,14 @@ class ViewletSettingsStorageNodeAdapter(XMLAdapterBase):
     __used_for__ = IViewletSettingsStorage
 
     def __init__(self, context, environ):
-        super(ViewletSettingsStorageNodeAdapter, self).__init__(context, environ)
+        super(ViewletSettingsStorageNodeAdapter, self).__init__(context,
+                                                                environ)
 
-        self.skins = [skin.token for skin in getUtility(IVocabularyFactory,
-                         'plone.app.vocabularies.Skins')(self.context)]
+        self.skins = [
+            skin.token for skin in
+            getUtility(IVocabularyFactory,
+                       'plone.app.vocabularies.Skins')(self.context)
+        ]
 
     def _exportNode(self):
         """
@@ -149,14 +153,17 @@ def _importNode(self, node):
             purgeChild = False
             if child.getAttribute('purge'):
                 purgeChild = self._convertToBoolean(
-                                                  child.getAttribute('purge'))
+                    child.getAttribute('purge')
+                )
             skinname = child.getAttribute('skinname')
             manager = child.getAttribute('manager')
             skins = getattr(storage, '_'+nodename)
 
-            all_skins = tuple(set(storage._hidden.keys() + \
-                                  storage._order.keys() + \
-                                  self.skins))
+            all_skins = tuple(set(
+                storage._hidden.keys() +
+                storage._order.keys() +
+                self.skins
+            ))
 
             if skinname == '*':
                 for skinname in all_skins:
@@ -195,8 +202,9 @@ def _importNode(self, node):
 
                 if child.hasAttribute('make_default'):
                     make_default = self._convertToBoolean(
-                                        child.getAttribute('make_default'))
-                    if make_default == True:
+                        child.getAttribute('make_default')
+                    )
+                    if make_default:
                         storage.setDefault(manager, skinname)
 
     def _purgeViewletSettings(self):

diff --git a/plone/app/viewletmanager/manager.py b/plone/app/viewletmanager/manager.py
@@ -153,11 +153,13 @@ def render(self):
                 if IAcquirer.providedBy(viewlet):
                     viewlet = viewlet.__of__(viewlet.context)
                 viewlet_id = "%s:%s" % (self.__name__, name)
-                options = {'index': index,
-                           'name': name,
-                           'hidden': name in hidden,
-                           'show_url': query_tmpl % urlencode({'show': viewlet_id}),
-                           'hide_url': query_tmpl % urlencode({'hide': viewlet_id})}
+                options = {
+                    'index': index,
+                    'name': name,
+                    'hidden': name in hidden,
+                    'show_url': query_tmpl % urlencode({'show': viewlet_id}),
+                    'hide_url': query_tmpl % urlencode({'hide': viewlet_id}),
+                }
 
                 if guarded_hasattr(viewlet, 'render'):
                     viewlet.update()
@@ -166,17 +168,20 @@ def render(self):
                     options['content'] = u""
                 if index > 0:
                     prev_viewlet = viewlets[index-1][0]
-                    query = {'move_above': "%s;%s" % (viewlet_id, prev_viewlet)}
+                    query = {'move_above': "%s;%s" % (viewlet_id,
+                                                      prev_viewlet)}
                     options['up_url'] = query_tmpl % urlencode(query)
                 if index < (len(viewlets) - 1):
                     next_viewlet = viewlets[index+1][0]
-                    query = {'move_below': "%s;%s" % (viewlet_id, next_viewlet)}
+                    query = {'move_below': "%s;%s" % (viewlet_id,
+                                                      next_viewlet)}
                     options['down_url'] = query_tmpl % urlencode(query)
                 results.append(options)
 
             self.name = self.__name__
             self.normalized_name = self.name.replace('.', '-')
-            self.interface = list(providedBy(self).flattened())[0].__identifier__
+            interface = list(providedBy(self).flattened())[0]
+            self.interface = interface.__identifier__
 
             # and output them
             return self.manager_template(viewlets=results)
@@ -250,8 +255,8 @@ def moveBelow(self, manager, viewlet, dest):
 
     def __call__(self):
         base_url = "%s/@@manage-viewlets" % str(
-                       getMultiAdapter((self.context, self.request),
-                       name='absolute_url'))
+            getMultiAdapter((self.context, self.request), name='absolute_url')
+        )
         qs = self.request.get('QUERY_STRING', None)
         if qs is not None:
             query = parse_qs(qs)

diff --git a/plone/app/viewletmanager/tests/__init__.py b/plone/app/viewletmanager/tests/__init__.py
@@ -1 +0,0 @@
-#

diff --git a/plone/app/viewletmanager/tests/test_docs.py b/plone/app/viewletmanager/tests/test_docs.py
@@ -12,13 +12,15 @@ def test_suite():
     from unittest import TestSuite
     suite = TestSuite()
     suite.addTests((
-        DocFileSuite('storage.txt',
-                     tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+        DocFileSuite(
+            'storage.txt',
+            tearDown=tearDown,
+            optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
         ),
-        DocFileSuite('manager.txt',
-                     tearDown=tearDown,
-                     optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
+        DocFileSuite(
+            'manager.txt',
+            tearDown=tearDown,
+            optionflags=doctest.NORMALIZE_WHITESPACE | doctest.ELLIPSIS,
         ),
     ))
     return suite