Changeset 3514 in products

Timestamp:

Aug 22, 2012 12:40:59 PM (12 years ago)

Author:

kroman0

Message:

Pep8 fixes

Location:

quintagroup.dropdownmenu/trunk

Files:

• quintagroup/dropdownmenu/browser/controlpanel.py (modified) (1 diff)
• quintagroup/dropdownmenu/browser/viewlets.py (modified) (8 diffs)
• quintagroup/dropdownmenu/interfaces.py (modified) (3 diffs)
• quintagroup/dropdownmenu/setuphandlers.py (modified) (1 diff)
• quintagroup/dropdownmenu/tests/test_controlpanel.py (modified) (1 diff)
• quintagroup/dropdownmenu/tests/test_docs.py (modified) (1 diff)
• quintagroup/dropdownmenu/tests/test_installation.py (modified) (6 diffs)
• setup.py (modified) (1 diff)

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/controlpanel.py

@@ -50 +50 @@
                 label = translate(term.title, context=widget.request,
                                   default=term.title)
-            widget.items.append({'id': id, 'name': widget.name + ':list',
+            widget.items.append({
+                'id': id, 'name': widget.name + ':list',
                 'value': term.token, 'label': label, 'checked': checked})
 

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/viewlets.py

@@ -43 +43 @@
     # typically purges entries after 60 minutes.
     return view.__name__ + \
-           path_key + \
-           language + \
-           str(time() // (60 * 5))
+        path_key + \
+        language + \
+        str(time() // (60 * 5))
 
 
@@ -57 +57 @@
     def func(view):
         portal_state = getMultiAdapter((view.context, view.request),
-                                        name=u'plone_portal_state')
+                                       name=u'plone_portal_state')
         # it is impossible to reliably cache entire rendered menu generated
         # with potral actions strategy.
         if not view.conf.enable_caching or view.conf.show_actions_tabs or \
-           (not portal_state.anonymous() and \
+            (not portal_state.anonymous() and
                 view.conf.caching_strategy == 'anonymous'):
             return f(view)
@@ -91 +91 @@
         self.site_url = getToolByName(context, 'portal_url')()
         self.context_state = getMultiAdapter((self.context, self.request),
-                                              name="plone_context_state")
+                                             name="plone_context_state")
         self.context_url = self.context_state.is_default_page() and \
             '/'.join(self.context.absolute_url().split('/')[:-1]) or \
@@ -120 +120 @@
         conf = self.conf
         tool = self.tool
+        url = self.context_url
+        starts = url.startswith
 
         # check if we have required root actions category inside tool
@@ -136 +138 @@
         delta = 1000
         for info in listtabs:
-            if  self.context_url.startswith(info['url']) and \
-                len(self.context_url) - len(info['url']) < delta:
+            if starts(info['url']) and len(url) - len(info['url']) < delta:
                 delta = len(self.context_url) - len(info['url'])
                 current_item = listtabs.index(info)
         self.id_chain = []
 
-        if current_item > -1 and current_item < len(listtabs) and \
-            (listtabs[current_item]['url'] != self.site_url or \
-            listtabs[current_item]['url'] == self.site_url and \
-            self.context_url == self.site_url):
-
+        active = listtabs[current_item]['url'] == self.site_url
+        active = active and self.context_url == self.site_url
+        active = listtabs[current_item]['url'] != self.site_url or active
+        if  current_item > -1 and current_item < len(listtabs) and active:
             self.mark_active(listtabs[current_item]['id'],
                              listtabs[current_item]['url'])
-
         self._activate(res)
         return res
@@ -165 +164 @@
                     # try to find out appropriate subcategory
                     subcat_id = self.cat_prefix + info['id'] + self.cat_sufix
-                    if subcat_id != info['id'] and \
-                       subcat_id in category.objectIds():
+                    in_category = subcat_id in category.objectIds()
+                    if subcat_id != info['id'] and in_category:
                         subcat = category._getOb(subcat_id)
                         if IActionCategory.providedBy(subcat):
@@ -173 +172 @@
                                                          info['url'])
 
-                parent_id = category.getId().replace(self.cat_prefix,
-                                '').replace(self.cat_sufix, '')
+                parent_id = category.getId()
+                parent_id = parent_id.replace(self.cat_prefix, '')
+                parent_id = parent_id.replace(self.cat_sufix, '')
                 tab = {'id': info['id'],
-                   'title': info['title'],
-                   'url': info['url'],
-                   'parent': (parent_id, parent_url)}
+                       'title': info['title'],
+                       'url': info['url'],
+                       'parent': (parent_id, parent_url)}
                 tabslist.append(tab)
 
@@ -218 +218 @@
         ec = self.tool._getExprContext(object)
         actions = [ActionInfo(action, ec) for action in category.objectValues()
-                    if IAction.providedBy(action)]
+                   if IAction.providedBy(action)]
 
         action_infos = []

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/interfaces.py

@@ -11 +11 @@
     [SimpleTerm(value=u'anonymous', title=_(u'Cache only for anonymous')),
      SimpleTerm(value=u'all', title=_(u'Cache for all users')), ]
-    )
+)
 
 
@@ -89 +89 @@
         description=_(u"Caching of the menu viewlet improves page rendering "
                       u"speed."),
-        default=True
-        )
+        default=True)
 
     caching_strategy = schema.Choice(
@@ -97 +96 @@
                       u"built."),
         default="anonymous",
-        vocabulary=cachings
-        )
+        vocabulary=cachings)
 
     mobile_menu = schema.Bool(
         title=_(u"Display menu as select for small screens"),
         description=_(u"Use select tag to display menu for small screens"),
-        default=False,
-        )
+        default=False)

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/setuphandlers.py

@@ -36 +36 @@
     if qiprod:
         utilities = getattr(qiprod, 'utilities', [])
-        todel = filter(lambda k: not sum(map(
-                    lambda i: PROJECT_NAME in i, k)), utilities)
+        is_project = lambda i: PROJECT_NAME in i
+        todel = filter(lambda k: not sum(map(is_project, k)), utilities)
         for u in todel:
             uidx = utilities.index(u)

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/tests/test_controlpanel.py

@@ -21 +21 @@
         # Check if dropdownmenu is in the control panel
         self.controlpanel = getToolByName(self.portal, "portal_controlpanel")
-        self.failUnless('dropdownmenu' in [a.getAction(self)['id']
-                            for a in self.controlpanel.listActions()])
+        self.failUnless('dropdownmenu' in [
+            a.getAction(self)['id']
+            for a in self.controlpanel.listActions()])
 
     def test_show_icons(self):

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/tests/test_docs.py

@@ -28 +28 @@
         #    test_class=TestCase),
 
-        ])
+    ])

quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/tests/test_installation.py

@@ -25 +25 @@
         qi = self.portal.portal_quickinstaller
         self.assertTrue(qi.isProductInstalled(PROJECT_NAME),
-            '%s is not installed.' % PROJECT_NAME)
+                        '%s is not installed.' % PROJECT_NAME)
 
     def testInstalledDependencies(self):
         cp = self.portal.portal_controlpanel
         configlets = [ai['id'] for ai in cp.listActionInfos(
-                                             check_permissions=0)]
+                      check_permissions=0)]
         self.assertTrue([1 for ai in configlets if ai == "plone.app.registry"],
-                'Not installed required plone.app.registry product.')
+                        'Not installed required plone.app.registry product.')
 
     def testStyles(self):
@@ -43 +43 @@
         cp = self.portal.portal_controlpanel
         configlets = [ai['id'] for ai in cp.listActionInfos(
-                                             check_permissions=0)]
+                      check_permissions=0)]
         for cid in CONFIGLETS:
-            self.assertTrue([1 for ai in configlets if ai == cid],
+            self.assertTrue([
+                1 for ai in configlets if ai == cid],
                 'No "%s" configlet added to plone control panel' % cid)
 
@@ -56 +57 @@
         afield = "show_content_tabs"
         self.assertTrue(registry.records.get(IPREFIX + afield, None),
-            "Not registered '%s' registry interface" % IPREFIX)
+                        "Not registered '%s' registry interface" % IPREFIX)
 
 
@@ -64 +65 @@
         qi = self.portal.portal_quickinstaller
         self.assertFalse(qi.isProductInstalled(PROJECT_NAME),
-            '%s not uninstalled.' % PROJECT_NAME)
+                         '%s not uninstalled.' % PROJECT_NAME)
 
     def testStyles(self):
@@ -75 +76 @@
         cp = self.portal.portal_controlpanel
         configlets = [ai['id'] for ai in cp.listActionInfos(
-                                            check_permissions=0)]
+                      check_permissions=0)]
         for cid in CONFIGLETS:
             self.assertFalse([1 for ai in configlets if ai == cid],
-                '"%s" configlet not uninstalled '\
-                'from plone control panel' % cid)
+                             '"%s" configlet not uninstalled '
+                             'from plone control panel' % cid)
 
     def testBrowserLayer(self):
         self.assertFalse(IDropDownMenuLayer in blutils.registered_layers(),
-                     "Not unregistered 'IDropDownMenuLayer' browser layer")
+                         "Not unregistered 'IDropDownMenuLayer' browser layer")
 
     def testRegistry(self):
@@ -89 +90 @@
         afield = "show_content_tabs"
         self.assertFalse(registry.records.get(IPREFIX + afield, None),
-            "Not unregistered '%s' registry interface" % IPREFIX)
+                         "Not unregistered '%s' registry interface" % IPREFIX)
 
 

quintagroup.dropdownmenu/trunk/setup.py

@@ -5 +5 @@
 
 tests_require = ['zope.testing',
-               'collective.testcaselayer']
+                 'collective.testcaselayer']
 
 setup(name='quintagroup.dropdownmenu',
       version=version,
       description="Multilevel portal dropdown menu for Plone sites.",
-      long_description=open("README.txt").read() + "\n" +
-                       open(os.path.join("docs", "HISTORY.txt")).read(),
+      long_description=open("README.txt").read(
+      ) + "\n" + open(os.path.join("docs", "HISTORY.txt")).read(),
       classifiers=[
-        "Framework :: Plone",
-        "Programming Language :: Python",
-        "License :: OSI Approved :: GNU General Public License (GPL)",
-        "Operating System :: OS Independent",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        ],
+          "Framework :: Plone",
+          "Programming Language :: Python",
+          "License :: OSI Approved :: GNU General Public License (GPL)",
+          "Operating System :: OS Independent",
+          "Topic :: Software Development :: Libraries :: Python Modules",
+      ],
       keywords='web plone menu',
       author='Quintagroup',