# HG changeset patch
# User Matthias Klose <doko@xxxxxxxxxx>
# Date 1284482781 -3600
# Node ID 95c90bd63aedb0f38f4899f27ecc9ae8e1fe6011
# Parent 65010d314adb1efe0674b2c1e7337affc6dbe57b
tools/python: Replace python string exceptions with ValueError exceptions
There are at least some syntax errors when trying to use the xen utils with
python2.6. The attached patch changes these string exception into
ValueErrors:
- tools/python/xen/util/bugtool.py (getBugTitle)
- tools/python/xen/xend (class XendBase): not catched
- tools/python/xen/xm/xenapi_create.py (sxp2xmlconvert_sxp_to_xml):
the method already raises a ValueError for similiar condition.
- tools/python/xen/xm/main.py (xm_network_attach): not catched.
For all but maybe the first one, the replacement of the string
exceptions into ValueErrors seems to be safe.
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
tools/python/xen/util/bugtool.py | 2 +-
tools/python/xen/xend/XendBase.py | 2 +-
tools/python/xen/xm/main.py | 2 +-
tools/python/xen/xm/xenapi_create.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff -r 65010d314adb -r 95c90bd63aed tools/python/xen/util/bugtool.py
--- a/tools/python/xen/util/bugtool.py Mon Sep 13 17:48:19 2010 +0100
+++ b/tools/python/xen/util/bugtool.py Tue Sep 14 17:46:21 2010 +0100
@@ -141,7 +141,7 @@ def getBugTitle(bug):
finally:
f.close()
- raise "Could not find title of bug %d!" % bug
+ raise ValueError("Could not find title of bug %d!" % bug)
def send(bug, conn, fd, filename, username, password):
diff -r 65010d314adb -r 95c90bd63aed tools/python/xen/xend/XendBase.py
--- a/tools/python/xen/xend/XendBase.py Mon Sep 13 17:48:19 2010 +0100
+++ b/tools/python/xen/xend/XendBase.py Tue Sep 14 17:46:21 2010 +0100
@@ -115,7 +115,7 @@ class XendBase:
# In OSS, ref == uuid
return uuid
else:
- raise "Big Error.. TODO!"
+ raise ValueError("Big Error.. TODO!")
def get_all_records(cls):
return dict([(inst.get_uuid(), inst.get_record())
diff -r 65010d314adb -r 95c90bd63aed tools/python/xen/xm/main.py
--- a/tools/python/xen/xm/main.py Mon Sep 13 17:48:19 2010 +0100
+++ b/tools/python/xen/xm/main.py Tue Sep 14 17:46:21 2010 +0100
@@ -2796,7 +2796,7 @@ def xm_network_attach(args):
for ref, record in server.xenapi.network
.get_all_records().items()])
if bridge not in networks.keys():
- raise "Unknown bridge name!"
+ raise ValueError("Unknown bridge name!")
return networks[bridge]
vif_conv = {
diff -r 65010d314adb -r 95c90bd63aed tools/python/xen/xm/xenapi_create.py
--- a/tools/python/xen/xm/xenapi_create.py Mon Sep 13 17:48:19 2010 +0100
+++ b/tools/python/xen/xm/xenapi_create.py Tue Sep 14 17:46:21 2010 +0100
@@ -707,7 +707,7 @@ class sxp2xml:
vm.attributes['security_label'] = \
security.set_security_label(sec_data[0][1][1],sec_data[0][2][1])
except Exception, e:
- raise "Invalid security data format: %s" % str(sec_data)
+ raise ValueError("Invalid security data format: %s" %
str(sec_data))
# Make the name tag
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home