Jan Beulich wrote:
>>>> Gerd Hoffmann <kraxel@xxxxxxxxxx> 10.03.09 14:44 >>>
>> Which makes me think at least the hashlib one needs a more sophisticated
>> approach so it keeps working on pre-2.5 versions ...
>
> Something like this (I had hoped this would have been submitted long ago,
> but apparently it wasn't even attempted).
> -import sha
> +try:
> + import hashlib # python v2.6 or newer
> +except ImportError:
> + import sha # python v2.5 or older
Well, due to the renaming (sha.sha -> hashlib.sha1) it isn't *that*
easy. Patch below could work. WARNING: untested.
cheers,
Gerd
diff -up xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated
xen-3.3.1/tools/python/xen/util/acmpolicy.py
--- xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated 2009-03-09
17:22:39.000000000 +0100
+++ xen-3.3.1/tools/python/xen/util/acmpolicy.py 2009-03-10
16:48:14.000000000 +0100
@@ -17,7 +17,10 @@
#============================================================================
import os
-import sha
+try:
+ from hashlib import sha1
+except ImportError:
+ from sha import sha as sha1
import stat
import array
import struct
@@ -1103,7 +1106,7 @@ class ACMPolicy(XSPolicy):
def hash(self):
""" Calculate a SAH1 hash of the XML policy """
- return sha.sha(self.toxml())
+ return sha1(self.toxml())
def save(self):
### Save the XML policy into a file ###
diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated
xen-3.3.1/tools/python/xen/xend/XendAPI.py
--- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated 2009-03-10
11:16:47.000000000 +0100
+++ xen-3.3.1/tools/python/xen/xend/XendAPI.py 2009-03-10 13:13:33.000000000
+0100
@@ -18,7 +18,6 @@
import inspect
import os
import Queue
-import sets
import string
import sys
import traceback
@@ -116,7 +115,7 @@ event_registrations = {}
def event_register(session, reg_classes):
if session not in event_registrations:
event_registrations[session] = {
- 'classes' : sets.Set(),
+ 'classes' : set(),
'queue' : Queue.Queue(EVENT_QUEUE_LENGTH),
'next-id' : 1
}
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home