46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
Index: xen-3.4.0-testing/tools/python/xen/util/acmpolicy.py
|
|
===================================================================
|
|
--- xen-3.4.0-testing.orig/tools/python/xen/util/acmpolicy.py
|
|
+++ xen-3.4.0-testing/tools/python/xen/util/acmpolicy.py
|
|
@@ -17,7 +17,10 @@
|
|
#============================================================================
|
|
|
|
import os
|
|
-import sha
|
|
+try:
|
|
+ import hashlib # python v2.6 or newer
|
|
+except ImportError:
|
|
+ import sha # python v2.5 or older
|
|
import stat
|
|
import array
|
|
import struct
|
|
Index: xen-3.4.0-testing/tools/python/xen/xend/XendAPI.py
|
|
===================================================================
|
|
--- xen-3.4.0-testing.orig/tools/python/xen/xend/XendAPI.py
|
|
+++ xen-3.4.0-testing/tools/python/xen/xend/XendAPI.py
|
|
@@ -18,7 +18,6 @@
|
|
import inspect
|
|
import os
|
|
import Queue
|
|
-import sets
|
|
import string
|
|
import sys
|
|
import traceback
|
|
@@ -119,7 +118,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
|
|
}
|
|
@@ -131,7 +130,6 @@ def event_register(session, reg_classes)
|
|
event_registrations[session]['classes'].update(reg_classes)
|
|
|
|
|
|
-
|
|
def event_unregister(session, unreg_classes):
|
|
if session not in event_registrations:
|
|
return
|