[Erp5-report] r30908 - /erp5/trunk/products/ERP5Type/Utils.py

[nobody at svn.erp5.org]

Author: yo
Date: Sat Nov 28 21:16:51 2009
New Revision: 30908

URL: http://svn.erp5.org?rev=30908&view=rev
Log:
Import hash algorithms from hashlib, if possible.

Modified:
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=30908&r1=30907&r2=30908&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Sat Nov 28 21:16:51 2009
@@ -33,8 +33,14 @@
 import string
 import time
 import warnings
-from md5 import new as md5_new
-from sha import new as sha_new
+try:
+  # Python 2.5 or later
+  from hashlib import md5 as md5_new
+  from hashlib import sha1 as sha_new
+except ImportError:
+  # Python 2.4
+  from md5 import new as md5_new
+  from sha import new as sha_new
 
 from zope.interface import implementedBy