pep8 cleanup (fixed)

Products/CMFPlone/ActionIconsTool.py

@@ -27,27 +27,27 @@ class ActionIconsTool(PloneBaseTool, BaseTool):
     toolicon = 'skins/plone_images/confirm_icon.png'
 
     security.declareProtected(View, 'renderActionIcon')
-    def renderActionIcon( self,
-                          category,
-                          action_id,
-                          default=None,
-                          context=None ):
+    def renderActionIcon(self,
+                         category,
+                         action_id,
+                         default=None,
+                         context=None):
         """ Returns the actual object for the icon.  If you
             pass in a path elements in default it will attempt
             to traverse to that path.  Otherwise it will return
             None
         """
-        icon = self.queryActionIcon( category,
-                                     action_id,
-                                     default=default,
-                                     context=context )
+        icon = self.queryActionIcon(category,
+                                    action_id,
+                                    default=default,
+                                    context=context)
         if icon is not None:
-            portal=getToolByName(self, 'portal_url').getPortalObject()
+            portal = getToolByName(self, 'portal_url').getPortalObject()
             return portal.restrictedTraverse(icon)
 
         return default
 
-    def getActionIcon( self, category, action_id, context=None ):
+    def getActionIcon(self, category, action_id, context=None):
         ai = BaseTool.getActionIcon(self, category, action_id,
                                     context=context)
         if ai:
@@ -60,8 +60,7 @@ def getActionIcon( self, category, action_id, context=None ):
             return ai
         return None
 
-    def queryActionIcon( self, category, action_id
-                       , default=None, context=None ):
+    def queryActionIcon(self, category, action_id, default=None, context=None):
         ai = BaseTool.queryActionIcon(self, category, action_id,
                                       default=default, context=context)
         if ai:
@@ -89,13 +88,8 @@ def addActionIcon(self, category, action_id, icon_expr, title=None,
 
     #Below we need to invalidate the cache for icons.  We have to
     #hardocde the module dict because we do not have events, yet.
-    def updateActionIcon( self
-                        , category
-                        , action_id
-                        , icon_expr
-                        , title=None
-                        , priority=0
-                        ):
+    def updateActionIcon(self, category, action_id, icon_expr,
+                         title=None, priority=0):
         """ update ActionIcons and remove cache entry """
         log_deprecated("The icon for the '%s/%s' action is being updated on "
                        "the action icons tool. The action icons tool has "
@@ -107,30 +101,24 @@ def updateActionIcon( self
                                   title, priority)
         removeAICacheEntry(category, action_id)
 
-    def removeActionIcon( self, category, action_id ):
+    def removeActionIcon(self, category, action_id):
         """ remove ActionIcon and remove cache entry """
         BaseTool.removeActionIcon(self, category, action_id)
         removeAICacheEntry(category, action_id)
 
-    def clearActionIcons( self ):
+    def clearActionIcons(self):
         """ clear ActionIcons and cache entries """
         BaseTool.clearActionIcons(self)
         iconcache.clear()
 
-    def manage_updateActionIcon( self
-                               , category
-                               , action_id
-                               , icon_expr
-                               , title
-                               , priority
-                               , REQUEST
-                               ):
+    def manage_updateActionIcon(self, category, action_id, icon_expr, title,
+                                priority, REQUEST):
         """ update ActionIcons from ZMI and remove cache entry """
-        BaseTool.manage_updateActionIcon( self, category, action_id, icon_expr,
-                                          title, priority, REQUEST )
+        BaseTool.manage_updateActionIcon(self, category, action_id, icon_expr,
+                                         title, priority, REQUEST)
         removeAICacheEntry(category, action_id)
 
-    def manage_removeActionIcon( self, category, action_id, REQUEST ):
+    def manage_removeActionIcon(self, category, action_id, REQUEST):
         """ remove ActionIcons from ZMI and remove cache entry """
         BaseTool.manage_removeActionIcon(self, category, action_id, REQUEST)
         removeAICacheEntry(category, action_id)

Products/CMFPlone/ActionsTool.py

@@ -119,12 +119,12 @@ def listFilteredActionsFor(self, object=None,
                 actions.extend(object.listActionInfos(object=object))
 
         # Reorganize the actions by category.
-        filtered_actions={'user': [],
-                          'folder': [],
-                          'object': [],
-                          'global': [],
-                          'workflow': [],
-                          }
+        filtered_actions = {'user': [],
+                            'folder': [],
+                            'object': [],
+                            'global': [],
+                            'workflow': [],
+                           }
 
         for action in actions:
             catlist = filtered_actions.setdefault(action['category'], [])

Products/CMFPlone/CalendarTool.py

@@ -11,7 +11,7 @@ class CalendarTool(PloneBaseTool, BaseTool):
     security = ClassSecurityInfo()
     toolicon = 'skins/plone_images/event_icon.png'
 
-    firstweekday = 0 # 0 is Monday
+    firstweekday = 0  # 0 is Monday
 
     security.declarePublic('getDayNumbers')
     def getDayNumbers(self):
@@ -31,8 +31,8 @@ def getDayNumbers(self):
         >>> ctool.getDayNumbers()[0] == fwday
         True
         """
-        firstweekday = self._getCalendar().firstweekday()+1
-        return [i%7 for i in range(firstweekday, firstweekday + 7)]
+        firstweekday = self._getCalendar().firstweekday() + 1
+        return [i % 7 for i in range(firstweekday, firstweekday + 7)]
 
     security.declarePublic('getEventsForCalendar')
     def getEventsForCalendar(self, month='1', year='2002', **kw):
@@ -55,7 +55,7 @@ def getEventsForCalendar(self, month='1', year='2002', **kw):
         for week in daysByWeek:
             days = []
             for day in week:
-                if events.has_key(day):
+                if day in events:
                     days.append(events[day])
                 else:
                     days.append({'day': day, 'event': 0, 'eventslist': []})
@@ -88,8 +88,8 @@ def catalog_getevents(self, year, month, **kw):
         query = ctool(**query_args)
 
         # compile a list of the days that have events
-        eventDays={}
-        for daynumber in range(1, 32): # 1 to 31
+        eventDays = {}
+        for daynumber in range(1, 32):  # 1 to 31
             eventDays[daynumber] = {'eventslist': [],
                                     'event': 0,
                                     'day': daynumber}
@@ -99,7 +99,7 @@ def catalog_getevents(self, year, month, **kw):
                 break
             else:
                 includedevents.append(result.getRID())
-            event={}
+            event = {}
             # we need to deal with events that end next month
             if  result.end.month() != month:
                 # doesn't work for events that last ~12 months
@@ -120,7 +120,7 @@ def catalog_getevents(self, year, month, **kw):
             event['title'] = result.Title or result.getId
 
             if eventStartDay != eventEndDay:
-                allEventDays = range(eventStartDay, eventEndDay+1)
+                allEventDays = range(eventStartDay, eventEndDay + 1)
                 eventDays[eventStartDay]['eventslist'].append(
                         {'end': None,
                          'start': result.start.Time(),
@@ -137,7 +137,8 @@ def catalog_getevents(self, year, month, **kw):
                 if result.end == result.end.earliestTime():
                     last_day_data = eventDays[allEventDays[-2]]
                     last_days_event = last_day_data['eventslist'][-1]
-                    last_days_event['end'] = (result.end-1).latestTime().Time()
+                    last_days_event['end'] = \
+                        (result.end - 1).latestTime().Time()
                 else:
                     eventDays[eventEndDay]['eventslist'].append(
                         {'end': result.end.Time(),

Products/CMFPlone/CatalogTool.py

@@ -203,7 +203,7 @@ def getObjPositionInParent(obj):
         return ordered.getObjectPosition(obj.getId())
     return 0
 
-SIZE_CONST = {'kB': 1024, 'MB': 1024*1024, 'GB': 1024*1024*1024}
+SIZE_CONST = {'kB': 1024, 'MB': 1024 * 1024, 'GB': 1024 * 1024 * 1024}
 SIZE_ORDER = ('GB', 'MB', 'kB')
 
 
@@ -237,9 +237,9 @@ def getObjSize(obj):
         if size < SIZE_CONST[smaller]:
             return '1 %s' % smaller
         for c in SIZE_ORDER:
-            if size/SIZE_CONST[c] > 0:
+            if size / SIZE_CONST[c] > 0:
                 break
-        return '%.1f %s' % (float(size/float(SIZE_CONST[c])), c)
+        return '%.1f %s' % (float(size / float(SIZE_CONST[c])), c)
     return size
 
 
@@ -467,6 +467,7 @@ def manage_catalogRebuild(self, RESPONSE=None, URL1=None):
               URL1 + '/manage_catalogAdvanced?manage_tabs_message=' +
               urllib.quote('Catalog Rebuilt\n'
                            'Total time: %s\n'
-                           'Total CPU time: %s' % (`elapse`, `c_elapse`)))
+                           'Total CPU time: %s'
+                                % (repr(elapse), repr(c_elapse))))
 
 InitializeClass(CatalogTool)

Products/CMFPlone/DiscussionTool.py

@@ -4,7 +4,8 @@
 from Products.CMFPlone.PloneBaseTool import PloneBaseTool
 from Products.CMFDefault.permissions import ReplyToItem
 
-from plone.intelligenttext.transforms import convertWebIntelligentPlainTextToHtml
+from plone.intelligenttext.transforms \
+    import convertWebIntelligentPlainTextToHtml
 
 
 class DiscussionTool(PloneBaseTool, BaseTool):