[Erp5-report] r30909 - /erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

[nobody at svn.erp5.org]

Author: yo
Date: Sat Nov 28 21:35:19 2009
New Revision: 30909

URL: http://svn.erp5.org?rev=30909&view=rev
Log:
Shut up a deprecation warning in Python 2.6.

Modified:
    erp5/trunk/products/ZSQLCatalog/SQLCatalog.py

Modified: erp5/trunk/products/ZSQLCatalog/SQLCatalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ZSQLCatalog/SQLCatalog.py?rev=30909&r1=30908&r2=30909&view=diff
==============================================================================
--- erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] (original)
+++ erp5/trunk/products/ZSQLCatalog/SQLCatalog.py [utf8] Sat Nov 28 21:35:19 2009
@@ -40,7 +40,10 @@
 from xml.dom.minidom import parse
 from xml.sax.saxutils import escape, quoteattr
 import os
-import md5
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import md5
 
 from interfaces.query_catalog import ISearchKeyCatalog
 from zope.interface.verify import verifyClass
@@ -1039,7 +1042,7 @@
           random_factor_list.append(os.getloadavg())
         except (OSError, AttributeError): # AttributeError is required under cygwin
           pass
-        instance_id = md5.new(str(random_factor_list)).hexdigest()
+        instance_id = md5(str(random_factor_list)).hexdigest()
         uid_list = [x.uid for x in method(count = UID_BUFFER_SIZE, instance_id = instance_id) if x.uid != 0]
       uid_buffer.extend(uid_list)