aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-04-20 13:48:31 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-04-20 13:48:31 +0100
commitc6c343f8884bf914f94bfb82878374627820b275 (patch)
tree9008dfe04e7f9cd3c82a5ad85034860e32616a9d
parente4640b6f1f3259730393219ee6539421852aec62 (diff)
downloadxen-c6c343f8884bf914f94bfb82878374627820b275.tar.gz
xen-c6c343f8884bf914f94bfb82878374627820b275.tar.bz2
xen-c6c343f8884bf914f94bfb82878374627820b275.zip
xend: The method union_update on a set was renamed to update in Python 2.3
From: Ruben Kerkhof <ruben@rubenkerkhof.com> Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-rw-r--r--tools/python/xen/xend/XendAPI.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py
index e61e655bcf..fb39fd87c7 100644
--- a/tools/python/xen/xend/XendAPI.py
+++ b/tools/python/xen/xend/XendAPI.py
@@ -125,7 +125,11 @@ def event_register(session, reg_classes):
}
if not reg_classes:
reg_classes = classes
- event_registrations[session]['classes'].union_update(reg_classes)
+ if hasattr(set, 'union_update'):
+ event_registrations[session]['classes'].union_update(reg_classes)
+ else:
+ event_registrations[session]['classes'].update(reg_classes)
+
def event_unregister(session, unreg_classes):