Changeset 3546 in products

Timestamp:

Sep 10, 2012 5:02:38 PM (12 years ago)

Author:

vmaksymiv

Message:

PPP fixes

Location:

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha

Files:

• error.py (modified) (1 diff)
• field.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests.py (modified) (10 diffs)
• validator.py (modified) (5 diffs)

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/error.py

@@ -1 +1 @@
 from z3c.form import error
-from quintagroup.z3cform.captcha import widget 
+from quintagroup.z3cform.captcha import widget
 
 CaptchaFailureMessage = error.ErrorViewMessage(

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/field.py

@@ -3 +3 @@
 from quintagroup.z3cform.captcha.interfaces import ICaptcha
 
+
 class Captcha(ASCIILine):
     implements(ICaptcha)

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/interfaces.py

@@ -1 +1 @@
 from zope.schema.interfaces import IASCIILine
+
 
 class ICaptcha(IASCIILine):
     u"""A field for captcha validation"""
-

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/tests.py

@@ -5 +5 @@
 from zope.schema.interfaces import IField
 from zope.component import queryMultiAdapter
-from zope.publisher.browser import TestRequest
 
 from z3c.form import form
@@ -28 +27 @@
 from quintagroup.z3cform.captcha.validator import CaptchaValidator
 
+
 @onsetup
 def setup_product():
@@ -42 +42 @@
 
 setup_product()
-ptc.setupPloneSite(extension_profiles=['quintagroup.captcha.core:default',])
+ptc.setupPloneSite(extension_profiles=['quintagroup.captcha.core:default', ])
 
 
@@ -55 +55 @@
 
     def testCaptchaWidgetInterface(self):
-        self.assertEqual(IFieldWidget.implementedBy(CaptchaWidgetFactory), True)
+        self.assertEqual(
+            IFieldWidget.implementedBy(CaptchaWidgetFactory), True)
 
     def testWidgetRegistration(self):
@@ -64 +65 @@
     def testValidatorRegistration(self):
         cfield = Captcha()
-        cvalidator = queryMultiAdapter((None, self.request, None, cfield, None),
-                IValidator)
+        cvalidator = queryMultiAdapter(
+            (None, self.request, None, cfield, None),
+            IValidator)
         self.assertNotEqual(cvalidator, None)
 
@@ -96 +98 @@
             '(?:value="(?P<value>[0-9a-fA-F]+)"\s*)' \
             '){3}/>'
-        open('/tmp/z3c.form.html','w').write(self.html)
+        open('/tmp/z3c.form.html', 'w').write(self.html)
         hidden = re.search(HIDDENTAG, self.html)
         self.assertTrue(hidden and hidden.group('value'))
@@ -110 +112 @@
         FIELDTAG = '<input\s+[^>]*type=\"text\"\s*[^>]*>'
         self.assertEqual(re.search(FIELDTAG, self.html) is not None, True)
-        
+
 
 class TestCaptchaValidator(ptc.PloneTestCase):
@@ -130 +132 @@
         cwidget = CaptchaWidget(self.request)
         cwidget.form = cform
-        self.validator = CaptchaValidator(self.portal, self.request, None, None, cwidget)
+        self.validator = CaptchaValidator(self.portal, self.request, None,
+                                          None, cwidget)
 
     def testSubmitRightCaptcha(self):
         decrypted = decrypt(self.captcha_key, self.hashkey)
-        key = getWord(int(parseKey(decrypted)['key'])-1 )
+        key = getWord(int(parseKey(decrypted)['key']) - 1)
         try:
-            res = self.validator.validate(key)
+            self.validator.validate(key)
         except ConversionError, e:
             self.fail("Rised unexpected %s error on right captcha submit" % e)
@@ -142 +145 @@
     def testSubmitWrongCaptcha(self):
         try:
-            res = self.validator.validate("wrong key")
+            self.validator.validate("wrong key")
         except ValueError, e:
             self.assertEqual(str(e), u'Please re-enter validation code.')
@@ -150 +153 @@
     def testSubmitRightCaptchaTwice(self):
         decrypted = decrypt(self.captcha_key, self.hashkey)
-        key = getWord(int(parseKey(decrypted)['key'])-1 )
+        key = getWord(int(parseKey(decrypted)['key']) - 1)
         self.validator.validate(key)
         try:
-            res = self.validator.validate(key)
+            self.validator.validate(key)
         except ValueError, e:
             self.assertEqual(str(e), u'Please re-enter validation code.')
         else:
-            self.fail("No ValueError rised on right captcha key " \
+            self.fail("No ValueError rised on right captcha key "
                       "submitting twice")
 

quintagroup.z3cform.captcha/trunk/quintagroup/z3cform/captcha/validator.py

@@ -1 +1 @@
 from DateTime import DateTime
 
-from zope.interface import Interface, Invalid
+from zope.interface import Interface
 from zope.component import adapts
 from zope.i18n import MessageFactory
@@ -15 +15 @@
 _ = MessageFactory('quintagroup.z3cform.captcha')
 
+
 class CaptchaValidator(SimpleFieldValidator):
     """Captcha validator"""
@@ -24 +25 @@
         if 'kss_z3cform_inline_validation' in self.request['URL']:
             return
-        errors = ()
         context = self.context
         request = self.request
@@ -33 +33 @@
             decrypted_key = decrypt(context.captcha_key, hashkey)
             parsed_key = parseKey(decrypted_key)
-            
+
             index = parsed_key['key']
             date = parsed_key['date']
-            
+
             if captcha_type == 'static':
                 img = getattr(context, '%s.jpg' % index)
@@ -44 +44 @@
                 enc = value
                 solution = getWord(int(index))
-            
+
             captcha_tool = getToolByName(context, 'portal_captchas')
             if (enc != solution) or (captcha_tool.has_key(decrypted_key)) or (DateTime().timeTime() - float(date) > 3600):