Blame xen-fix-deprecated-warnings.patch
|
 |
ce25e4f |
diff -up xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated xen-3.3.1/tools/python/xen/util/acmpolicy.py
|
|
|
ce25e4f |
--- xen-3.3.1/tools/python/xen/util/acmpolicy.py.deprecated 2009-03-09 17:22:39.000000000 +0100
|
|
|
ce25e4f |
+++ xen-3.3.1/tools/python/xen/util/acmpolicy.py 2009-03-09 17:23:09.000000000 +0100
|
|
|
ce25e4f |
@@ -17,7 +17,7 @@
|
|
|
ce25e4f |
#============================================================================
|
|
|
ce25e4f |
|
|
|
ce25e4f |
import os
|
|
|
ce25e4f |
-import sha
|
|
|
ce25e4f |
+import hashlib
|
|
|
ce25e4f |
import stat
|
|
|
ce25e4f |
import array
|
|
|
ce25e4f |
import struct
|
|
|
ce25e4f |
@@ -1103,7 +1103,7 @@ class ACMPolicy(XSPolicy):
|
|
|
ce25e4f |
|
|
|
ce25e4f |
def hash(self):
|
|
|
ce25e4f |
""" Calculate a SAH1 hash of the XML policy """
|
|
|
ce25e4f |
- return sha.sha(self.toxml())
|
|
|
ce25e4f |
+ return hashlib.sha1(self.toxml())
|
|
|
ce25e4f |
|
|
|
ce25e4f |
def save(self):
|
|
|
ce25e4f |
### Save the XML policy into a file ###
|
|
|
ce25e4f |
diff -up xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated xen-3.3.1/tools/python/xen/xend/XendAPI.py
|
|
|
ce25e4f |
--- xen-3.3.1/tools/python/xen/xend/XendAPI.py.deprecated 2009-03-10 11:16:47.000000000 +0100
|
|
|
f49bf52 |
+++ xen-3.3.1/tools/python/xen/xend/XendAPI.py 2009-03-10 13:13:33.000000000 +0100
|
|
|
ce25e4f |
@@ -18,7 +18,6 @@
|
|
|
ce25e4f |
import inspect
|
|
|
ce25e4f |
import os
|
|
|
ce25e4f |
import Queue
|
|
|
ce25e4f |
-import sets
|
|
|
ce25e4f |
import string
|
|
|
ce25e4f |
import sys
|
|
|
ce25e4f |
import traceback
|
|
|
ce25e4f |
@@ -116,7 +115,7 @@ event_registrations = {}
|
|
|
ce25e4f |
def event_register(session, reg_classes):
|
|
|
ce25e4f |
if session not in event_registrations:
|
|
|
ce25e4f |
event_registrations[session] = {
|
|
|
ce25e4f |
- 'classes' : sets.Set(),
|
|
|
f49bf52 |
+ 'classes' : set(),
|
|
|
ce25e4f |
'queue' : Queue.Queue(EVENT_QUEUE_LENGTH),
|
|
|
ce25e4f |
'next-id' : 1
|
|
|
ce25e4f |
}
|