Changeset 3115 in products

Timestamp:

Apr 14, 2011 5:04:01 PM (13 years ago)

Author:

kroman0

Message:

Pyflakes and pep8 fixes #2

Location:

quintagroup.plonecomments/trunk/quintagroup/plonecomments

Files:

• browser/comments.py (modified) (6 diffs)
• interfaces.py (modified) (1 diff)
• patch.py (modified) (1 diff)
• setuphandlers.py (modified) (1 diff)
• tests/common.py (modified) (2 diffs)
• tests/config.py (modified) (1 diff)
• tests/testQPloneCommentsCommenting.py (modified) (2 diffs)
• tests/testQPloneCommentsConfiglet.py (modified) (1 diff)
• tests/testQPloneCommentsInstall.py (modified) (1 diff)
• utils.py (modified) (1 diff)

quintagroup.plonecomments/trunk/quintagroup/plonecomments/browser/comments.py

@@ -41 +41 @@
         purl = getToolByName(self.context, 'portal_url')
         mtool = getToolByName(self.context, 'portal_membership')
-        portrait_url = purl() + '/defaultUser.gif' 
+        portrait_url = purl() + '/defaultUser.gif'
         email = ''
 
@@ -51 +51 @@
             mem_id = getattr(member,'getId',lambda:'Anonymous User')()
             portrait = mtool.getPersonalPortrait(mem_id)
-            portrait_url =  portrait.absolute_url()
+            portrait_url = portrait.absolute_url()
         else:
             email = reply.getProperty('email',d='')
@@ -69 +69 @@
         portal_properties = getToolByName(self.context, 'portal_properties')
         prop_sheet = portal_properties['qPloneComments']
-        value =  prop_sheet.getProperty('enable_authenticated_report_abuse', False)
+        value = prop_sheet.getProperty('enable_authenticated_report_abuse', False)
         return value
 
@@ -76 +76 @@
         portal_properties = getToolByName(self.context, 'portal_properties')
         prop_sheet = portal_properties['qPloneComments']
-        value =  prop_sheet.getProperty('enable_anonymous_report_abuse', False)
+        value = prop_sheet.getProperty('enable_anonymous_report_abuse', False)
         return value
 
@@ -83 +83 @@
         portal_properties = getToolByName(self.context, 'portal_properties')
         prop_sheet = portal_properties['qPloneComments']
-        value =  prop_sheet.getProperty('enable_ajax_report_abuse', False)
+        value = prop_sheet.getProperty('enable_ajax_report_abuse', False)
         return value
 
@@ -100 +100 @@
         """ """
         return getToolByName(self.context, 'portal_url')
-
 
 

quintagroup.plonecomments/trunk/quintagroup/plonecomments/interfaces.py

@@ -1 +1 @@
 from plone.theme.interfaces import IDefaultPloneLayer
+
 
 class IPloneCommentsLayer(IDefaultPloneLayer):

quintagroup.plonecomments/trunk/quintagroup/plonecomments/patch.py

@@ -45 +45 @@
     # Control of performing moderation
     if getProp(self, 'enable_moderation', marker=False):
-        roles = [role['name'] for role in self.acl_users.rolesOfPermission('Moderate Discussion')
-                 if role['selected'] == 'SELECTED']
+        roles = [role['name']
+            for role in self.acl_users.rolesOfPermission('Moderate Discussion')
+            if role['selected'] == 'SELECTED']
         roles.append('DiscussionManager')
         item.manage_permission('Delete objects', roles, acquire=1)

quintagroup.plonecomments/trunk/quintagroup/plonecomments/setuphandlers.py

@@ -44 +44 @@
     logger = context.getLogger(LOGGER)
 
-    portal_conf=getToolByName(portal, 'portal_controlpanel')
+    portal_conf = getToolByName(portal, 'portal_controlpanel')
     portal_conf.unregisterConfiglet('prefs_comments_setup_form')
     logger.info('Unregister configlet prefs_comments_setup_form. ')

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/common.py

@@ -2 +2 @@
 # Common constants and methods
 #
+from Products.CMFCore.utils import getToolByName
 
-from Products.CMFCore.utils import getToolByName
 
 def addMembers(portal, users_map):
@@ -9 +9 @@
     membership = getToolByName(portal, 'portal_membership', None)
     for user_id in users_map.keys():
-        membership.addMember(user_id, users_map[user_id]['passw'] , users_map[user_id]['roles'], [], 
-                            {'email': '%s@test.com'%user_id,})
+        membership.addMember(user_id, users_map[user_id]['passw'],
+                             users_map[user_id]['roles'], [],
+                             {'email': '%s@test.com' % user_id,})
+
 
 def add2Group(portal, group, group_members):

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/config.py

@@ -16 +16 @@
 
 PERM_NAME = 'Moderate Discussion'
-USERS = {# Common Members
+USERS = {  # Common Members
          'admin':{'passw': 'secret_admin', 'roles': ['Manager']},
          'owner':{'passw': 'secret_owner', 'roles': ['Owner']},
          'member':{'passw': 'secret_member', 'roles': ['Member']},
          'reviewer':{'passw': 'secret_reviewer', 'roles': ['Reviewer']},
-         # Members for discussion manager group
+           # Members for discussion manager group
          'dm_admin':{'passw': 'secret_dm_admin', 'roles': ['Manager']},
          'dm_owner':{'passw': 'secret_dm_owner', 'roles': ['Owner']},

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsCommenting.py

@@ -73 +73 @@
             "Anonymous user CAN'T really add comment in terned ON *Anonymous commenting mode*.")
 
+
     def testAddCommentToDocNotAnonymUsers(self):
 
@@ -176 +177 @@
             self.illegal_common_users = [u for u in COMMON_USERS_IDS if not u in self.allowable_common_users]
 
-    
     def testAddCommentToNotPublishedReplyDMUsers(self):
 

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsConfiglet.py

@@ -78 +78 @@
             "role NOT added" %  actual_reply_permission)
         # Simulate switching OFF Anonymous Commenting
-        if self.request.form.has_key('enable_anonymous_commenting'):
-           del self.request.form['enable_anonymous_commenting']
+        if 'enable_anonymous_commenting' in self.request.form:
+            del self.request.form['enable_anonymous_commenting']
         self.portal.prefs_comments_setup()
         actual_reply_permission = getReplyRoles()

quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsInstall.py

@@ -33 +33 @@
                 'There is no %s folder in portal_skins.' % PRODUCT_SKIN_NAME)
         for skin in skinstool.getSkinSelections():
-            path = skinstool.getSkinPath(skin)
+            path = skinstool.getSkinPath(skin)
             layers = map(str.strip, path.split(','))
             self.failUnless(PRODUCT_SKIN_NAME in layers,
-                '%s layer is not registered for %s.' % (PRODUCT_SKIN_NAME, skin))
+                '%s layer is not registered for %s.' % (PRODUCT_SKIN_NAME, skin))
 
     def test_layer_install(self):

quintagroup.plonecomments/trunk/quintagroup/plonecomments/utils.py

@@ -44 +44 @@
     props = filter(lambda x: prop_sheet.getProperty(x), prop_sheet.propertyIds())
 
-    actions = { 'onPublish': ('enable_approve_user_notification',
-                              'enable_reply_user_notification',
-                              'enable_published_notification',),
-                'onDelete' : ('enable_rejected_user_notification',),
-                'onApprove': ('enable_approve_notification',),
-                'onAnonymousReportAbuse': ('enable_anonymous_report_abuse',),
-                'onAuthenticatedReportAbuse': ('enable_authenticated_report_abuse',),}
+    actions = {
+        'onPublish':                    ('enable_approve_user_notification',
+                                         'enable_reply_user_notification',
+                                         'enable_published_notification',),
+        'onDelete':                     ('enable_rejected_user_notification',),
+        'onApprove':                    ('enable_approve_notification',),
+        'onAnonymousReportAbuse':       ('enable_anonymous_report_abuse',),
+        'onAuthenticatedReportAbuse':   ('enable_authenticated_report_abuse',),
+        }
 
     if action == 'publishing':