42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
|
Index: xen-3.3.1-testing/tools/python/xen/util/acmpolicy.py
|
||
|
|
===================================================================
|
||
|
|
--- xen-3.3.1-testing.orig/tools/python/xen/util/acmpolicy.py
|
||
|
|
+++ xen-3.3.1-testing/tools/python/xen/util/acmpolicy.py
|
||
|
|
@@ -17,7 +17,7 @@
|
||
|
|
#============================================================================
|
||
|
|
|
||
|
|
import os
|
||
|
|
-import sha
|
||
|
|
+import hashlib
|
||
|
|
import stat
|
||
|
|
import array
|
||
|
|
import struct
|
||
|
|
Index: xen-3.3.1-testing/tools/python/xen/xend/XendAPI.py
|
||
|
|
===================================================================
|
||
|
|
--- xen-3.3.1-testing.orig/tools/python/xen/xend/XendAPI.py
|
||
|
|
+++ xen-3.3.1-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
|
||
|
|
@@ -116,13 +115,13 @@ 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
|
||
|
|
}
|
||
|
|
if not reg_classes:
|
||
|
|
reg_classes = classes
|
||
|
|
- event_registrations[session]['classes'].union_update(reg_classes)
|
||
|
|
+ event_registrations[session]['classes'].update(reg_classes)
|
||
|
|
|
||
|
|
|
||
|
|
def event_unregister(session, unreg_classes):
|