mirror of
https://github.com/Stichting-MINIX-Research-Foundation/pkgsrc-ng.git
synced 2025-08-03 09:48:00 -04:00
48 lines
1.4 KiB
Plaintext
48 lines
1.4 KiB
Plaintext
$NetBSD: patch-fg,v 1.1 2010/05/05 06:12:36 cegger Exp $
|
|
|
|
--- python/xen/xend/XendAPI.py.orig 2009-08-06 12:56:37.000000000 +0000
|
|
+++ python/xen/xend/XendAPI.py
|
|
@@ -18,7 +18,6 @@
|
|
import inspect
|
|
import os
|
|
import Queue
|
|
-import sets
|
|
import string
|
|
import sys
|
|
import traceback
|
|
@@ -26,6 +25,12 @@ import threading
|
|
import time
|
|
import xmlrpclib
|
|
|
|
+# sets is deprecated as of python 2.6, but set is unavailable in 2.3
|
|
+try:
|
|
+ set
|
|
+except NameError:
|
|
+ from sets import Set as set
|
|
+
|
|
import XendDomain, XendDomainInfo, XendNode, XendDmesg
|
|
import XendLogging, XendTaskManager, XendAPIStore
|
|
|
|
@@ -117,16 +122,17 @@ 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
|
|
- if hasattr(set, 'union_update'):
|
|
- event_registrations[session]['classes'].union_update(reg_classes)
|
|
+ sessionclasses = event_registrations[session]['classes']
|
|
+ if hasattr(sessionclasses, 'union_update'):
|
|
+ sessionclasses.union_update(reg_classes)
|
|
else:
|
|
- event_registrations[session]['classes'].update(reg_classes)
|
|
+ sessionclasses.update(reg_classes)
|
|
|
|
|
|
|