Changeset 3132 in products

Timestamp:

Apr 18, 2011 1:57:47 PM (15 years ago)

Author:

vmaksymiv

Message:

pylint fixes

Location:

quintagroup.captcha.core/trunk/quintagroup/captcha/core

Files:

• setuphandlers.py (modified) (1 diff)
• tests/testConfiglet.py (modified) (3 diffs)
• tests/testDynamic.py (modified) (2 diffs)
• tests/testInstallation.py (modified) (1 diff)
• tests/testStatic.py (modified) (2 diffs)
• tests/testWidget.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

quintagroup.captcha.core/trunk/quintagroup/captcha/core/setuphandlers.py

@@ -4 +4 @@
 
 from quintagroup.captcha.core.config import CAPTCHA_KEY, CONFIGLET_ID, \
-    ALL_LAYERS, PROPERTY_SHEET
+    PROPERTY_SHEET
 
 

quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testConfiglet.py

@@ -1 +1 @@
 import re
 import string
-from base import *
-
+from base import ptc, default_password, portal_owner, LAYER_STATIC_CAPTCHAS, \
+    PROPERTY_SHEET, LAYER_DYNAMIC_CAPTCHAS, PRODUCT_NAME
 
 class TestConfiglet(ptc.FunctionalTestCase):
@@ -18 +18 @@
 
     def layerInSkins(self, layer):
-        res = False
         skins = self.portal.portal_skins
         for skin in skins.getSkinSelections():
@@ -36 +35 @@
 
     def test_dynamicOn(self):
-        res = self.publish(self.save_url + '&static_captchas=dynamic',
+        self.publish(self.save_url + '&static_captchas=dynamic',
                      self.basic_auth).getBody()
 

quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testDynamic.py

@@ -1 +1 @@
 import string
 from os.path import abspath, dirname
-from base import *
+from base import LAYER_STATIC_CAPTCHAS, LAYER_DYNAMIC_CAPTCHAS, PRODUCT_NAME, \
+    utils, unittest, ptc
 
-from DateTime import DateTime
-from Products.CMFFormController.ControllerState import ControllerState
+from quintagroup.captcha.core.utils import getWord, decrypt, parseKey
 
 from testStatic import TestStaticValidator
@@ -78 +78 @@
         # getCaptchaImage function must return image coded in hashkey same to
         # image get by 'key' after parsing decrypted key
-        decrypted_key = decrypt(self.captcha_key, self.hashkey)
-        parsed_key = parseKey(decrypted_key)
 
         img_html = self.publish(

quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testInstallation.py

@@ -1 @@
-from base import *
+from base import LAYERS, LAYER_STATIC_CAPTCHAS, PROPERTY_SHEET, CONFIGLET_ID, \
+    TOOL_ID, CAPTCHA_KEY, PRODUCT_NAME, getToolByName, unittest, ptc
 
 

quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testStatic.py

@@ -1 +1 @@
 import string
-from base import *
+from base import LAYER_STATIC_CAPTCHAS, CAPTCHAS_COUNT, PRODUCT_NAME, \
+    encrypt1, parseKey, ptc, unittest, decrypt, getWord
 
 from DateTime import DateTime
@@ -96 +97 @@
     def testBadKey(self):
         hashkey = self.portal.getCaptcha()
-        decrypted_key = decrypt(self.captcha_key, hashkey)
-        key = getWord(int(parseKey(decrypted_key)['key']) - 1)
         self.req.form['hashkey'] = hashkey
         self.req.form['key'] = 'bad key'

quintagroup.captcha.core/trunk/quintagroup/captcha/core/tests/testWidget.py

@@ -1 +1 @@
 import string
-from base import *
+from base import GLOBALS, getWord, decrypt, parseKey, portal_owner, \
+    re, default_password, testPatch, ptc, unittest, PRODUCT_NAME
 
 from Products.CMFCore.DirectoryView import registerDirectory
 from Products.CMFCore.DirectoryView import addDirectoryViews
-from Products.CMFCore.DirectoryView import DirectoryView
 
 NOT_VALID = re.compile("Please re\-enter validation code")

quintagroup.captcha.core/trunk/quintagroup/captcha/core/utils.py

@@ -12 +12 @@
 
 from quintagroup.captcha.core.data import basic_english
-from quintagroup.captcha.core.config import *
+#import quintagroup.captcha.core configuration values
+from quintagroup.captcha.core.config import (DEFAULT_IMAGE_SIZE, DEFAULT_BG,
+    DEFAULT_FONT_COLOR, DEFAULT_DISTORTION, CAPTCHAS_COUNT)
 
 try:
     import Crypto.Cipher.DES as Crypto
-except:
+except ImportError:
     import Crypto
 
@@ -37 +39 @@
     from PIL import ImageFont
     from PIL import ImageDraw
-    from PIL import ImageFilter
     import random
     from PIL import ImageFile as pyImageFile