Ignore:
Timestamp:
Apr 14, 2011 4:45:57 PM (13 years ago)
Author:
kroman0
Message:

Pyflakes and pep8 fixes

Location:
quintagroup.plonecomments/trunk/quintagroup/plonecomments
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/__init__.py

    r822 r3114  
    33# Feed our monkeys :-) 
    44from quintagroup.plonecomments import patch 
    5  
     5patch 
    66allow_module('quintagroup.plonecomments.utils') 

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

    r2611 r3114  
    22try: 
    33    import hashlib as md5 
     4    md5.md5 
    45except ImportError: 
    56    import md5 
    … …  
    3940    def getGravatar(self, reply): 
    4041        purl = getToolByName(self.context, 'portal_url') 
    41         mtool = getToolByName(self.context, 'portal_membership')             
     42        mtool = getToolByName(self.context, 'portal_membership') 
    4243        portrait_url = purl() + '/defaultUser.gif'  
    4344        email = '' 
    … …  
    6364            'default':portrait_url, 'size':str(size)}) 
    6465        return gravatar_url 
    65          
    6666 
    6767    def authenticated_report_abuse_enabled(self): 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/config.py

    r832 r3114  
    22 
    33LOGGER = 'quintagroup.plonecomments' 
     4PRODUCTS = [] 
    45 
    5 PRODUCTS = [] 
    66 
    77def warning(msg): 

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

    r3112 r3114  
    22try: 
    33    from App.class_init import InitializeClass 
     4    InitializeClass 
    45except ImportError: 
    56    from Globals import InitializeClass 
    … …  
    1819 
    1920    id = int(DateTime().timeTime()) 
    20     while self._container.get(str(id), None) is not None: 
     21    while container.get(str(id), None) is not None: 
    2122        id += 1 
    2223    id = str(id) 
    … …  
    3031            item.creator = Creator 
    3132 
    32     self._container[id] = item 
     33    container[id] = item 
    3334    item = item.__of__(self) 
    3435 
    … …  
    4546    if getProp(self, 'enable_moderation', marker=False): 
    4647        roles = [role['name'] for role in self.acl_users.rolesOfPermission('Moderate Discussion') 
    47                  if role['selected']== 'SELECTED'] 
     48                 if role['selected'] == 'SELECTED'] 
    4849        roles.append('DiscussionManager') 
    4950        item.manage_permission('Delete objects', roles, acquire=1) 
    … …  
    5758    return id 
    5859 
    59 def getReplies( self ): 
     60def getReplies(self): 
    6061    """Return a sequence of the DiscussionResponse objects which are 
    6162       associated with this Discussable. 

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

    r3112 r3114  
    4444    logger = context.getLogger(LOGGER) 
    4545 
    46     portal_conf=getToolByName(context.getSite(),'portal_controlpanel') 
     46    portal_conf=getToolByName(portal, 'portal_controlpanel') 
    4747    portal_conf.unregisterConfiglet('prefs_comments_setup_form') 
    4848    logger.info('Unregister configlet prefs_comments_setup_form. ') 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/base.py

    r3112 r3114  
    44 
    55from Testing import ZopeTestCase as ztc 
    6 from AccessControl.SecurityManagement import newSecurityManager, \ 
    7     noSecurityManager 
    8  
    96from Products.PloneTestCase import PloneTestCase as ptc 
    10 from Products.PloneTestCase.layer import onsetup, PloneSiteLayer 
    11 from Products.CMFCore.utils import getToolByName 
     7from Products.PloneTestCase.layer import onsetup 
    128 
    139from quintagroup.plonecomments.tests.config import PRODUCT 

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

    r3113 r3114  
    1616        self.request = self.app.REQUEST 
    1717 
    18         # VERY IMPORTANT to guarantee product skin's content visibility 
     18        # VERY IMPORTANT to guarantee product skin's content visibility 
    1919        self._refreshSkinData() 
    2020 
    … …  
    2323        for user_id in USERS.keys(): 
    2424            self.membership.addMember(user_id, USERS[user_id]['passw'], 
    25                 USERS[user_id]['roles'], []) 
     25                USERS[user_id]['roles'], []) 
    2626 
    2727        # Add users to Discussion Manager group 
    2828        portal_groups = getToolByName(self.portal, 'portal_groups') 
    2929        dm_group = portal_groups.getGroupById('DiscussionManager') 
    30         dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS] 
     30        [dm_group.addMember(u) for u in DM_USERS_IDS] 
    3131 
    3232        # Allow discussion for Document 
    … …  
    7171        replies_after = len(self.discussion.getDiscussionFor(doc_obj).getReplies()) 
    7272        self.failUnless(replies_after-replies_before, 
    73             "Anonymous user CAN'T really add comment in terned ON *Anonymous commenting mode*.") 
     73            "Anonymous user CAN'T really add comment in terned ON *Anonymous commenting mode*.") 
    7474 
    7575    def testAddCommentToDocNotAnonymUsers(self): 
    … …  
    119119                self.login(u) 
    120120            self.assertRaises(Unauthorized, doc_obj.discussion_reply, 
    121                 "%s's reply" % u, "text of '%s' reply" % u) 
     121                "%s's reply" % u, "text of '%s' reply" % u) 
    122122            self.login('dm_admin') 
    123123            replies_after = self.discussion.getDiscussionFor(doc_obj).getReplies() 
    … …  
    126126                failed_users.append(u) 
    127127        self.failIf(failed_users, 
    128             "%s user(s) CAN really add comment in terned OFF " 
    129             "*Anonymous commenting mode*." % failed_users) 
     128            "%s user(s) CAN really add comment in terned OFF " 
     129            "*Anonymous commenting mode*." % failed_users) 
    130130 
    131131 
    … …  
    151151                failed_users.append(u) 
    152152        self.failIf(failed_users, 
    153             "%s - user(s) can not really add commentin terned OFF " 
    154             "*Anonymous commenting mode*." % failed_users) 
     153            "%s - user(s) can not really add commentin terned OFF " 
     154            "*Anonymous commenting mode*." % failed_users) 
    155155 
    156156 
    … …  
    194194                failed_users.append(u) 
    195195        self.failIf(failed_users, 
    196             "%s - member(s) of DiscussionManager group CAN'T really ADD comment" % failed_users) 
     196            "%s - member(s) of DiscussionManager group CAN'T really ADD comment" % failed_users) 
    197197 
    198198        # This is actual only in terned OFF *Anonymous commenting mode* 
    … …  
    210210                failed_users.append(u) 
    211211        self.failIf(failed_users, 
    212             "%s user(s) CAN really add comment in terned OFF " 
    213             "*Anonymous commenting mode*." % failed_users) 
     212            "%s user(s) CAN really add comment in terned OFF " 
     213            "*Anonymous commenting mode*." % failed_users) 
    214214 
    215215    """ 
    … …  
    263263                failed_users.append(u) 
    264264        self.failIf(failed_users, 
    265             "%s - user(s) can not really add comment to PUBLISHED reply." % failed_users) 
     265            "%s - user(s) can not really add comment to PUBLISHED reply." % failed_users) 
    266266 
    267267        # 3.Check adding reply to reply for illegal users 
    … …  
    274274            self.discussion.getDiscussionFor(reply) 
    275275            self.assertRaises(Unauthorized, reply.discussion_reply, 
    276                 "Reply %s" % u, "text of %s reply" % u) 
     276                "Reply %s" % u, "text of %s reply" % u) 
    277277 
    278278 
    … …  
    304304        self.discussion.getDiscussionFor(doc_obj) 
    305305        doc_obj.discussion_reply("A Reply to '%s'" % self.doc_moder_off_id, 
    306             "text of reply to '%s'" % self.doc_moder_off_id) 
     306            "text of reply to '%s'" % self.doc_moder_off_id) 
    307307 
    308308 
    … …  
    330330                failed_users.append(u) 
    331331        self.failIf(failed_users , 
    332             "%s - member(s) CAN'T really ADD comment in terned off" 
    333             " comments Moderation mode." % failed_users) 
     332            "%s - member(s) CAN'T really ADD comment in terned off" 
     333            " comments Moderation mode." % failed_users) 
    334334 
    335335 
    … …  
    350350            self.discussion.getDiscussionFor(reply_to_doc) 
    351351            self.assertRaises(Unauthorized, reply_to_doc.discussion_reply, 
    352             "%s's reply" % u, "text of '%s' reply" % u) 
     352            "%s's reply" % u, "text of '%s' reply" % u) 
    353353 
    354354 

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

    r3113 r3114  
    2121    portal_groups = getToolByName(self.portal, 'portal_groups') 
    2222    dm_group = portal_groups.getGroupById('DiscussionManager') 
    23     dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS] 
     23    [dm_group.addMember(u) for u in DM_USERS_IDS] 
    2424 
    2525 
    … …  
    6161 
    6262        # Add testing document to portal 
    63         my_doc = self.portal.invokeFactory('Document', id='my_doc') 
     63        self.portal.invokeFactory('Document', id='my_doc') 
    6464        self.my_doc = self.portal['my_doc'] 
    6565        self.my_doc.edit(text_format='plain', text='hello world') 
    6666 
    6767    def testAnonymousCommenting(self): 
    68         getPortalReplyPerm = self.portal.rolesOfPermission 
    6968        def getReplyRoles(): 
    70             return [r['name'] for r in getPortalReplyPerm(ReplyToItem) if r['selected']=='SELECTED'] 
     69            return [r['name'] 
     70                    for r in self.portal.rolesOfPermission(ReplyToItem) 
     71                    if r['selected'] == 'SELECTED'] 
    7172        # Simulate switching ON Anonymous Commenting 
    7273        self.request.form['enable_anonymous_commenting'] = 'True' 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsModeration.py

    r3112 r3114  
    204204        for u in managers: 
    205205            self.login(u) 
    206             auth = '%s:%s' % (u,USERS[u]['passw']) 
    207206            doc_id = "doc_%s" % u 
    208207            doc_obj = getattr(self.portal, doc_id) 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsNotification.py

    r3113 r3114  
    2727    def afterSetUp(self): 
    2828        self.portal._original_MailHost = self.portal.MailHost 
    29         self.portal.MailHost = mailhost = MockMailHost('MailHost') 
     29        self.portal.MailHost = MockMailHost('MailHost') 
    3030 
    3131        self.loginAsPortalOwner() 
    … …  
    6262 
    6363        # Add testing document to portal 
    64         my_doc = self.portal.invokeFactory('Document', id='my_doc', title='Doc') 
     64        self.portal.invokeFactory('Document', id='my_doc', title='Doc') 
    6565        self.my_doc = self.portal['my_doc'] 
    6666        self.my_doc.edit(text_format='plain', text='hello world') 
    … …  
    126126        reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0] 
    127127        reply.discussion_reply('A Reply for comment' ,'text of reply for comment') 
    128         reply_for_comment = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0] 
     128        self.discussion.getDiscussionFor(self.my_doc).getReplies()[0] 
    129129        self.failUnless(testMailExistance(self), 'Mail was not sended when enable_reply_user_notification.') 
    130130 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsNotificationRecipients.py

    r3113 r3114  
    4040    def afterSetUp(self): 
    4141        self.portal._original_MailHost = self.portal.MailHost 
    42         self.portal.MailHost = mailhost = MockMailHost('MailHost') 
     42        self.portal.MailHost = MockMailHost('MailHost') 
    4343 
    4444        self.loginAsPortalOwner() 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsReportAbuse.py

    r3113 r3114  
    1 from Products.CMFCore.utils import getToolByName 
    21from quintagroup.plonecomments.tests.testQPloneCommentsCommenting import \ 
    32    TestCommBase 
    4 from zExceptions import Unauthorized 
    53 
    64 

  • quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/tests.py

    r965 r3114  
    11import unittest 
    22 
    3 from zope.testing import doctestunit 
    4 from zope.component import testing 
    5 from Testing import ZopeTestCase as ztc 
    6  
    7 from base import getToolByName, TestCase 
     3#from zope.testing import doctestunit 
     4#from zope.component import testing 
     5#from Testing import ZopeTestCase as ztc 
     6#from base import TestCase 
    87 
    98def test_suite(): 

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

    r2754 r3114  
    11import smtplib 
    2 from zope.i18n import translate 
    32from zope.i18nmessageid import MessageFactory 
    43_ = MessageFactory("quintagroup.plonecomments") 
    54from Products.CMFCore.utils import getToolByName 
    65from Products.CMFPlone.utils import safe_unicode 
    7 from config import warning 
    86 
    97# Get apropriate property from (propery_sheeet) configlet 
    … …  
    1311    config_ps = getattr(pp, 'qPloneComments', None) 
    1412    if config_ps: 
    15         result =  getattr(config_ps, prop_name, marker) 
     13        result = getattr(config_ps, prop_name, marker) 
    1614    return result 
    1715 
    … …  
    179177            subject = translate(_(u"published_notification_subject", 
    180178                default=u"[${organization_name}] New comment added", 
    181                 mapping={u"organization_name" : organization_name}), 
     179                mapping={u"organization_name": organization_name}), 
    182180                context=context.REQUEST) 
    183181        else: 
    … …  
    194192            subject = translate(_(u"approve_notification_subject", 
    195193                default=u"[${organization_name}] New comment awaits moderation", 
    196                 mapping={u"organization_name" : organization_name}), 
     194                mapping={u"organization_name": organization_name}), 
    197195                context=context.REQUEST) 
    198196        else: 
    … …  
    211209                    'mfrom': admin_email, 
    212210                    'obj': reply_parent, 
    213                     'message':message, 
     211                    'message': message, 
    214212                    'organization_name': organization_name, 
    215213                    'name': creator_name, 
    216                     'comment_id':comment_id, 
    217                     'comment_desc':comment.description, 
    218                     'comment_text':comment.text} 
     214                    'comment_id': comment_id, 
     215                    'comment_desc': comment.description, 
     216                    'comment_text': comment.text} 
    219217            subject = translate(_(u"report_abuse_subject", 
    220218                default=u"[${organization_name}] A comment on ${title} has " 
    … …  
    233231        host = context.plone_utils.getMailHost() 
    234232        try: 
    235             host.secureSend(msg, user_email, admin_email, subject = subject, 
    236                             subtype = 'plain', debug = False, charset = charset) 
     233            host.secureSend(msg, user_email, admin_email, subject=subject, 
     234                            subtype='plain', debug=False, charset=charset) 
    237235        except (smtplib.SMTPRecipientsRefused,smtplib.SMTPServerDisconnected): 
    238236            setStatusMsg(None, context, 
Note: See TracChangeset for help on using the changeset viewer.