[Erp5-report] r39889 kazuhiko - /erp5/trunk/products/CMFActivity/Activity/Queue.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Nov  4 10:54:37 2010
New Revision: 39889

URL: http://svn.erp5.org?rev=39889&view=rev
Log:
remove deprecation warning on python 2.6 or later.

Modified:
    erp5/trunk/products/CMFActivity/Activity/Queue.py

Modified: erp5/trunk/products/CMFActivity/Activity/Queue.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/Activity/Queue.py?rev=39889&r1=39888&r2=39889&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/Activity/Queue.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/Activity/Queue.py [utf8] Thu Nov  4 10:54:37 2010
@@ -30,7 +30,10 @@ import cPickle, sys
 from DateTime import DateTime
 from zLOG import LOG, WARNING, ERROR
 from ZODB.POSException import ConflictError
-import sha
+try:
+  from hashlib import sha1 as sha_new
+except ImportError:
+  from sha import new as sha_new
 from cStringIO import StringIO
 
 import transaction
@@ -261,7 +264,7 @@ class Queue:
       # is true in Python. This is important, because dtml-if assumes that an empty
       # string is false, so we must use a non-empty string for this.
       return 'none'
-    return sha.new(repr(order_validation_item_list)).hexdigest()
+    return sha_new(repr(order_validation_item_list)).hexdigest()
 
   def getMessageList(self, activity_tool, processing_node=None,**kw):
     return []