Description: Replace python string exceptions with ValueError exceptions Author: Matthias Klose Bug-Debian: http://bugs.debian.org/585372 Signed-off-by: Matthias Klose --- xen-4.0.1.orig/tools/python/xen/util/bugtool.py +++ xen-4.0.1/tools/python/xen/util/bugtool.py @@ -139,7 +139,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): --- xen-4.0.1.orig/tools/python/xen/xend/XendBase.py +++ xen-4.0.1/tools/python/xen/xend/XendBase.py @@ -114,7 +114,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()) --- xen-4.0.1.orig/tools/python/xen/xm/xenapi_create.py +++ xen-4.0.1/tools/python/xen/xm/xenapi_create.py @@ -702,7 +702,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-4.0.1.orig/tools/python/xen/xm/main.py +++ xen-4.0.1/tools/python/xen/xm/main.py @@ -2616,7 +2616,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 = {