Changeset 3162 in products

Timestamp:

Apr 20, 2011 2:11:46 PM (14 years ago)

Author:

vmaksymiv

Message:

pep8 fixes

Location:

quintagroup.plonecaptchas/trunk

Files:

• quintagroup/plonecaptchas/Extensions/Install.py (modified) (2 diffs)
• quintagroup/plonecaptchas/tests/base.py (modified) (4 diffs)
• quintagroup/plonecaptchas/tests/testForms.py (modified) (8 diffs)
• quintagroup/plonecaptchas/tests/testInstallation.py (modified) (3 diffs)
• setup.py (modified) (2 diffs)

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/Extensions/Install.py

@@ -2 +2 @@
 from Products.CMFCore.utils import getToolByName
 REQUIRED = 'quintagroup.captcha.core'
+
 
 def install(self):
@@ -13 +14 @@
     # install plonecaptchas
     gs = getToolByName(self, 'portal_setup')
-    gs.runAllImportStepsFromProfile('profile-quintagroup.plonecaptchas:default')
+    profile = 'profile-quintagroup.plonecaptchas:default'
+    gs.runAllImportStepsFromProfile(profile)
     transaction.savepoint()
+
 
 def uninstall(self):
     portal_setup = getToolByName(self, 'portal_setup')
-    portal_setup.runAllImportStepsFromProfile('profile-quintagroup.plonecaptchas:uninstall', purge_old=False)
+    profile = 'profile-quintagroup.plonecaptchas:uninstall'
+    portal_setup.runAllImportStepsFromProfile(profile, purge_old=False)
     transaction.savepoint()

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests/base.py

@@ -26 +26 @@
 
 ptc.setupPloneSite()
+
 
 class NotInstalled(PloneSite):
@@ -60 +61 @@
         js_layer = None
         if getattr(ptc_setup, 'PLONE33', 0):
-            js_layer = JF_PROFILE_PREFIX+'33'
+            js_layer = JF_PROFILE_PREFIX + '33'
         elif getattr(ptc_setup, 'PLONE32', 0):
-            js_layer = JF_PROFILE_PREFIX+'31_32'
+            js_layer = JF_PROFILE_PREFIX + '31_32'
         elif getattr(ptc_setup, 'PLONE31', 0):
-            js_layer = JF_PROFILE_PREFIX+'31_32'
+            js_layer = JF_PROFILE_PREFIX + '31_32'
         elif getattr(ptc_setup, 'PLONE30', 0):
-            js_layer = JF_PROFILE_PREFIX+'30'
+            js_layer = JF_PROFILE_PREFIX + '30'
         if js_layer is not None:
             gs = getattr(portal, 'portal_setup', None)
@@ -76 +77 @@
     def tearDown(cls):
         ptc_setup._placefulTearDown()
-        
+
 
 class TestCase(ptc.PloneTestCase):
     layer = Installed
+
 
 class TestCaseNotInstalled(ptc.PloneTestCase):
@@ -88 +90 @@
     layer = Installed
 
+
 class FunctionalTestCaseNotInstalled(ptc.FunctionalTestCase):
     layer = NotInstalled

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests/testForms.py

@@ -34 +34 @@
 testPatch()
 
+
 class TestFormMixin(FunctionalTestCase):
 
@@ -42 +43 @@
         addTestLayer(self)
         # Prepare form data
-        self.basic_auth = ':'.join((portal_owner,default_password))
+        self.basic_auth = ':'.join((portal_owner, default_password))
         self.form_url = ''
         self.form_method = "POST"
@@ -84 +85 @@
         self.form_method = "GET"
         response = self.publishForm().getBody()
-        patt = re.compile(IMAGE_PATT  % self.portal.absolute_url())
+        patt = re.compile(IMAGE_PATT % self.portal.absolute_url())
         match_obj = patt.search(response)
         img_url = match_obj.group(1)
 
-        content_type = self.publish('/plone' + img_url).getHeader('content-type')
+        content_type = self.publish('/plone' + img_url).getHeader(
+                                                            'content-type')
         self.assertTrue(content_type.startswith('image'),
             "Wrong captcha image content type")
 
     def testSubmitRightCaptcha(self):
-        key = getWord(int(parseKey(decrypt(self.captcha_key, self.hashkey))['key'])-1)
+        key = getWord(int(parseKey(decrypt(
+                self.captcha_key, self.hashkey))['key']) - 1)
         self.form_data['key'] = key
-        
+
         response = self.publishForm().getBody()
         self.assertFalse(NOT_VALID.search(response))
@@ -105 +108 @@
 
     def testSubmitRightCaptchaTwice(self):
-        key = getWord(int(parseKey(decrypt(self.captcha_key, self.hashkey))['key'])-1)
+        key = getWord(int(parseKey(decrypt(
+                self.captcha_key, self.hashkey))['key']) - 1)
         self.form_data['key'] = key
 
@@ -120 +124 @@
         self.portal['index_html'].allowDiscussion(True)
         self.form_url = '/index_html/discussion_reply_form'
-        
+
     def getFormData(self):
-        return {'form.submitted' : '1',
+        return {'form.submitted': '1',
                 'subject': 'testing',
                 'Creator': portal_owner,
                 'body_text': 'Text in Comment',
                 'discussion_reply:method': 'Save',
-                'form.button.form_submit' : 'Save'}
+                'form.button.form_submit': 'Save'}
 
 
@@ -141 +145 @@
 
     def getFormData(self):
-        return {"last_visit:date" : str(DateTime()),
-                "prev_visit:date" : str(DateTime()-1),
-                "came_from_prefs" : "",
-                "fullname" : "Tester",
-                "username" : "tester",
-                "email" : "tester@test.com",
-                'form.button.Register':'Register',
-                'form.submitted':'1'}
+        return {"last_visit:date": str(DateTime()),
+                "prev_visit:date": str(DateTime() - 1),
+                "came_from_prefs": "",
+                "fullname": "Tester",
+                "username": "tester",
+                "email": "tester@test.com",
+                'form.button.Register': 'Register',
+                'form.submitted': '1'}
 
 
@@ -158 +162 @@
         self.portal['index_html'].allowDiscussion(True)
         self.form_url = '/index_html/sendto_form'
-        
+
     def getFormData(self):
-        return {'form.submitted' : '1',
-                "send_to_address" : "recipient@test.com",
-                "send_from_address" : "sender@test.com",
+        return {'form.submitted': '1',
+                "send_to_address": "recipient@test.com",
+                "send_from_address": "sender@test.com",
                 'comment': 'Text in Comment',
-                'form.button.Send' : 'Save'}
+                'form.button.Send': 'Save'}
+
 
 class TestContactInfo(TestFormMixin):
@@ -171 +176 @@
         TestFormMixin.afterSetUp(self)
         # preparation to form correct working
-        self.portal._updateProperty('email_from_address','manager@test.com')
+        self.portal._updateProperty('email_from_address', 'manager@test.com')
         self.logout()
         self.form_url = '/contact-info'
-        
+
     def getFormData(self):
-        return {'form.submitted' : '1',
-                "sender_fullname" : "tester",
-                "sender_from_address" : "sender@test.com",
+        return {'form.submitted': '1',
+                "sender_fullname": "tester",
+                "sender_from_address": "sender@test.com",
                 'subject': 'Subject',
                 'message': 'Message',
-                'form.button.Send' : 'Save'}
+                'form.button.Send': 'Save'}
 
 

quintagroup.plonecaptchas/trunk/quintagroup/plonecaptchas/tests/testInstallation.py

@@ -5 +5 @@
 
 from quintagroup.plonecaptchas.config import PRODUCT_NAME
+
 
 class TestInstallation(TestCase):
@@ -18 +19 @@
             for layer in LAYERS:
                 self.assert_(layer.split('/')[0] in self.skins.objectIds(),
-                    '%s directory view not found in portal_skins after installation' % layer)
+                             '%s directory view not found in portal_skins '\
+                             'after installation' % layer)
                 self.assert_(layer in path,
                     '%s layer not found in %s' % (PRODUCT_NAME, skin))
@@ -31 +33 @@
             path = map(str.strip, path.split(','))
             for layer in LAYERS:
-                self.assertTrue(not layer.split('/')[0] in self.skins.objectIds(),
-                    '%s directory view found in portal_skins after uninstallation' % layer)
+                self.assertTrue(
+                        not layer.split('/')[0] in self.skins.objectIds(),
+                                '%s directory view found in portal_skins '\
+                                'after uninstallation' % layer)
                 self.assert_(not layer in path,
-                    '%s layer found in %s skin after uninstallation' % (layer, skin))
+                             '%s layer found in %s skin '\
+                             'after uninstallation' % (layer, skin))
+
 
 def test_suite():

quintagroup.plonecaptchas/trunk/setup.py

@@ -6 +6 @@
 setup(name='quintagroup.plonecaptchas',
       version=version,
-      description="quintagroup.plonecaptchas is simple captchas implementation for Plone, designed for validating human input in insecure forms.",
+      description="quintagroup.plonecaptchas is simple captchas "
+                  "implementation for Plone, designed for validating "
+                  "human input in insecure forms.",
       long_description=open("README.txt").read() + "\n" +
                        open(os.path.join("docs", "HISTORY.txt")).read(),
-      # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers
       classifiers=[
         "Framework :: Plone",
@@ -41 +42 @@
       target = plone
       """,
-      paster_plugins = ["ZopeSkel"],
+      paster_plugins=["ZopeSkel"],
       )