Changeset 3107 in products for quintagroup.plonecomments/branches/jquery

Timestamp:

Apr 13, 2011 4:40:58 PM (13 years ago)

Author:

kroman0

Message:

Pyflakes fixes

Location:

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments

Files:

• __init__.py (modified) (1 diff)
• browser/comments.py (modified) (2 diffs)
• patch.py (modified) (1 diff)
• setuphandlers.py (modified) (1 diff)
• tests/base.py (modified) (1 diff)
• tests/testQPloneCommentsCommenting.py (modified) (2 diffs)
• tests/testQPloneCommentsConfiglet.py (modified) (3 diffs)
• tests/testQPloneCommentsInstall.py (modified) (1 diff)
• tests/testQPloneCommentsModeration.py (modified) (2 diffs)
• tests/testQPloneCommentsNotification.py (modified) (4 diffs)
• tests/testQPloneCommentsNotificationRecipients.py (modified) (2 diffs)
• tests/testQPloneCommentsPermission.py (modified) (1 diff)
• tests/testQPloneCommentsReportAbuse.py (modified) (1 diff)
• tests/testQPloneCommentsUninstall.py (modified) (1 diff)
• tests/tests.py (modified) (1 diff)
• utils.py (modified) (1 diff)

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/__init__.py

@@ -3 +3 @@
 # Feed our monkeys :-)
 from quintagroup.plonecomments import patch
-
+patch
 allow_module('quintagroup.plonecomments.utils')

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.py

@@ -2 +2 @@
 try:
     import hashlib as md5
+    md5.md5
 except ImportError:
     import md5
@@ -8 +9 @@
 from AccessControl import getSecurityManager
 from Products.CMFPlone.utils import getToolByName
-from Products.CMFFormController.ControllerState import ControllerState
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from quintagroup.plonecomments.utils import manage_mails
 from plone.app.layout.viewlets import comments
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/patch.py

@@ -2 +2 @@
 try:
     from App.class_init import InitializeClass
+    InitializeClass
 except ImportError:
     from Globals import InitializeClass

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/setuphandlers.py

@@ -47 +47 @@
     logger = context.getLogger(LOGGER)
 
-    portal_conf = getToolByName(context.getSite(), '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/branches/jquery/quintagroup/plonecomments/tests/base.py

@@ -4 +4 @@
 
 from Testing import ZopeTestCase as ztc
-from AccessControl.SecurityManagement import newSecurityManager, \
-    noSecurityManager
 
 from Products.PloneTestCase import PloneTestCase as ptc
-from Products.PloneTestCase.layer import onsetup, PloneSiteLayer
-from Products.CMFCore.utils import getToolByName
+from Products.PloneTestCase.layer import onsetup
 
 from config import PRODUCT

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsCommenting.py

@@ -3 +3 @@
 #
 
+from Products.CMFCore.utils import getToolByName
 from zExceptions import Unauthorized
-from base import getToolByName, FunctionalTestCase
+from base import FunctionalTestCase
 from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS
 
@@ -26 +27 @@
         portal_groups = getToolByName(self.portal, 'portal_groups')
         dm_group = portal_groups.getGroupById('DiscussionManager')
-        dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS]
+        [dm_group.addMember(u) for u in DM_USERS_IDS]
 
         # Allow discussion for Document

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsConfiglet.py

@@ -4 +4 @@
 
 from Products.CMFCore.permissions import ReplyToItem
+from Products.CMFCore.utils import getToolByName
 from AccessControl.SecurityManagement import noSecurityManager
-from base import getToolByName, FunctionalTestCase
+from base import FunctionalTestCase
 from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS
 
@@ -20 +21 @@
     portal_groups = getToolByName(self.portal, 'portal_groups')
     dm_group = portal_groups.getGroupById('DiscussionManager')
-    dm_users = [dm_group.addMember(u) for u in DM_USERS_IDS]
+    [dm_group.addMember(u) for u in DM_USERS_IDS]
 
 
@@ -67 +68 @@
 
         # Add testing document to portal
-        my_doc = self.portal.invokeFactory('Document', id='my_doc')
+        self.portal.invokeFactory('Document', id='my_doc')
         self.my_doc = self.portal['my_doc']
         self.my_doc.edit(text_format='plain', text='hello world')

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsInstall.py

@@ -3 +3 @@
 #
 
-from base import getToolByName, TestCase
-from config import *
+from Products.CMFCore.utils import getToolByName
+from base import TestCase
+from config import PRODUCT, CONFIGLET_ID, PRODUCT_SKIN_NAME, PROPERTY_SHEET
+from config import EMAIL_PID, EMAIL_SUBJECT_PID, REQUIRE_EMAIL_PID, PERM_NAME
+from config import APPROVE_NOTIFICATION_PID, PUBLISHED_NOTIFICATION_PID
+from config import APPROVE_USER_NOTIFICATION_PID, REPLY_USER_NOTIFICATION_PID
+from config import MODERATION_PID, REJECTED_NOTIFICATION_PID
+from config import ANONYMOUS_COMMENTING_PID
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsModeration.py

@@ -4 +4 @@
 
 import re
-from common import *
-from base import getToolByName, FunctionalTestCase
-from config import USERS, PROPERTY_SHEET, DM_USERS_IDS, COMMON_USERS_IDS
+from Products.CMFCore.utils import getToolByName
+from common import addMembers, add2Group
+from base import FunctionalTestCase
+from config import USERS, DM_USERS_IDS, COMMON_USERS_IDS
 
 
@@ -225 +226 @@
         for u in managers:
             self.login(u)
-            auth = '%s:%s' % (u, USERS[u]['passw'])
             doc_id = "doc_%s" % u
             doc_obj = getattr(self.portal, doc_id)

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsNotification.py

@@ -2 +2 @@
 # Test configuration form working
 #
+
+from Products.CMFCore.utils import getToolByName
 import re
-from helperNotify import *
-from email.Header import Header
-
-from Products.CMFCore.permissions import ManagePortal, ReplyToItem
-import base64
-from email import message_from_string
+from helperNotify import setProperties, testMailExistance
 from quintagroup.plonecomments.utils import getMsg
-from base import getToolByName, FunctionalTestCase
+from base import FunctionalTestCase
 from config import *
 
@@ -33 +30 @@
     def afterSetUp(self):
         self.portal._original_MailHost = self.portal.MailHost
-        self.portal.MailHost = mailhost = MockMailHost('MailHost')
+        self.portal.MailHost = MockMailHost('MailHost')
 
         self.loginAsPortalOwner()
@@ -72 +69 @@
 
         # Add testing document to portal
-        my_doc = self.portal.invokeFactory('Document', id='my_doc',
-                                           title='Doc')
+        self.portal.invokeFactory('Document', id='my_doc', title='Doc')
         self.my_doc = self.portal['my_doc']
         self.my_doc.edit(text_format='plain', text='hello world')
@@ -150 +146 @@
         reply.discussion_reply('A Reply for comment',
                                'text of reply for comment')
-        reply_for_comment = self.getDiscussionReplies(self.my_doc)[0]
         self.failUnless(testMailExistance(self),
             'Mail was not sended when enable_reply_user_notification.')

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsNotificationRecipients.py

@@ -3 +3 @@
 #
 
-from Products.CMFCore.permissions import ManagePortal, ReplyToItem
-
-from quintagroup.plonecomments.utils import getMsg
-
+from Products.CMFCore.utils import getToolByName
 import re
-from helperNotify import *
-from email import message_from_string
-from email.Header import Header
-from base import getToolByName, FunctionalTestCase
-from common import *
+from helperNotify import setProperties
+from base import FunctionalTestCase
+from common import addMembers, add2Group
 from config import PROPERTY_SHEET
 
@@ -47 +42 @@
     def afterSetUp(self):
         self.portal._original_MailHost = self.portal.MailHost
-        self.portal.MailHost = mailhost = MockMailHost('MailHost')
+        self.portal.MailHost = MockMailHost('MailHost')
 
         self.loginAsPortalOwner()

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsPermission.py

@@ -3 +3 @@
 #
 
-from Products.CMFDefault.DiscussionItem import DiscussionItemContainer
-
-from base import getToolByName, TestCase
+from base import TestCase
 from config import PERM_NAME
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsReportAbuse.py

@@ -1 @@
-from base import getToolByName, TestCase
 from testQPloneCommentsCommenting import TestCommBase
-from zExceptions import Unauthorized
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/testQPloneCommentsUninstall.py

@@ -3 +3 @@
 #
 
-import unittest
-
-from base import getToolByName, TestErase
+from Products.CMFCore.utils import getToolByName
+from base import TestErase
 from config import PRODUCT, PRODUCT_SKIN_NAME, CONFIGLET_ID, PROPERTY_SHEET
 from zExceptions import BadRequest

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/tests/tests.py

@@ -1 +1 @@
 import unittest
 
-from zope.testing import doctestunit
-from zope.component import testing
-from Testing import ZopeTestCase as ztc
-
-from base import getToolByName, TestCase
+#from zope.testing import doctestunit
+#from zope.component import testing
+#from Testing import ZopeTestCase as ztc
+#from base import TestCase
 
 

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/utils.py

@@ -1 +1 @@
 import smtplib
-from zope.i18n import translate
 from zope.i18nmessageid import MessageFactory
 _ = MessageFactory("quintagroup.plonecomments")
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.utils import safe_unicode
-from config import warning