From f7024258aef3c6830bffeb18c772b80c1743626e Mon Sep 17 00:00:00 2001
From: Yoshinori Okuji <yo@nexedi.com>
Date: Sat, 28 Nov 2009 20:35:19 +0000
Subject: [PATCH] Shut up a deprecation warning in Python 2.6.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30909 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ZSQLCatalog/SQLCatalog.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/product/ZSQLCatalog/SQLCatalog.py b/product/ZSQLCatalog/SQLCatalog.py
index 33b53a1080..7d11c325e4 100644
--- a/product/ZSQLCatalog/SQLCatalog.py
+++ b/product/ZSQLCatalog/SQLCatalog.py
@@ -40,7 +40,10 @@ from cStringIO import StringIO
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 @@ class Catalog(Folder,
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)
--
2.30.9