Changeset 3121 in products for quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/widget.py

Timestamp:

Apr 15, 2011 1:00:00 PM (13 years ago)

Author:

vmaksymiv

Message:

pep8 fixes

File:

• quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/widget.py (modified) (6 diffs)

quintagroup.formlib.captcha/trunk/quintagroup/formlib/captcha/widget.py

@@ -23 +23 @@
 logger = logging.getLogger('quintagroup.formlib.captcha')
 
+
 class CaptchaWidget(ASCIIWidget):
 
@@ -42 +43 @@
 
         site = self.get_site()
-        portal_url = getToolByName(site , 'portal_url')()
+        portal_url = getToolByName(site, 'portal_url')()
         key = site.getCaptcha()
 
@@ -52 +53 @@
         return u"""<input type="hidden" value="%s" name="%shashkey" />
                    %s
-                   <img src="%s/getCaptchaImage/%s" alt="Enter the word"/>""" % (key,
-                                                                                 prefix,
-                                                                                 renderElement(self.tag, **kwargs),
-                                                                                 portal_url,
-                                                                                 key)
-         
+                   <img src="%s/getCaptchaImage/%s"
+                        alt="Enter the word"/>""" % (key,
+                                                     prefix,
+                                                     renderElement(self.tag,
+                                                                   **kwargs),
+                                                     portal_url,
+                                                     key)
+
     def _toFieldValue(self, input):
         # Verify the user input against the captcha
@@ -64 +67 @@
         site = self.get_site()
         captcha_type = site.getCaptchaType()
-        
+
         # validate captcha input
         if input and captcha_type in ['static', 'dynamic']:
@@ -72 +75 @@
             else:
                 prefix = ''
-            
+
             hashkey = self.request.get('%shashkey' % prefix, '')
             decrypted_key = decrypt(site.captcha_key, hashkey)
             parsed_key = parseKey(decrypted_key)
-            
+
             index = parsed_key['key']
             date = parsed_key['date']
-            
+
             if captcha_type == 'static':
                 img = getattr(site, '%s.jpg' % index)
@@ -87 +90 @@
                 enc = input
                 solution = getWord(int(index))
-            
+
             captcha_tool = getToolByName(site, 'portal_captchas')
-            if (enc != solution) or (captcha_tool.has_key(decrypted_key)) or (DateTime().timeTime() - float(date) > 3600):
+            if (enc != solution) or (decrypted_key in captcha_tool) or \
+               (DateTime().timeTime() - float(date) > 3600):
                 raise ConversionError(_(u'Please re-enter validation code.'))
             else:
                 captcha_tool.addExpiredKey(decrypted_key)
-        
+
         return super(CaptchaWidget, self)._toFieldValue(input)