Changeset 3514 in products for quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/viewlets.py

Timestamp:

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

Author:

kroman0

Message:

Pep8 fixes

File:

• quintagroup.dropdownmenu/trunk/quintagroup/dropdownmenu/browser/viewlets.py (modified) (8 diffs)

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 = []