Changeset 2180 in products

Timestamp:

Apr 20, 2010 10:49:11 AM (14 years ago)

Author:

kroman0

Message:

Fixed DeprecationWarning? for plone4

Location:

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

Files:

• CaptchaTool.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

quintagroup.captcha.core/trunk/quintagroup/captcha/core/CaptchaTool.py

@@ -1 @@
-from Globals import InitializeClass
+try:
+    from App.class_init import InitializeClass
+except ImportError:
+    from Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
 from Products.Transience.Transience import TransientObjectContainer

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

@@ -2 +2 @@
 import re
 import math
-import md5
+try:
+    import hashlib as md5
+except ImportError:
+    import md5
 from string import atoi
 from random import randint
@@ -17 +20 @@
 
 def encrypt1(s):
-    return md5.new(s).hexdigest().upper()
+    return md5.md5(s).hexdigest().upper()
 
 def getTransform(x, y, a, p, o):