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@eu.citrix.com>
xen-unstable changeset:   22153:95c90bd63aed
xen-unstable date:        Tue Sep 14 17:46:21 2010 +0100

diff --git a/tools/python/xen/util/bugtool.py b/tools/python/xen/util/bugtool.py
index 18569dcb330cbea2f3a487bac2881b5a57c74c38..e8d96b884af37e78d715324f97e57126f6fcb30e 100644 (file)
--- a/tools/python/xen/util/bugtool.py
+++ b/tools/python/xen/util/bugtool.py
@@ -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 --git a/tools/python/xen/xend/XendBase.py b/tools/python/xen/xend/XendBase.py
index 73fed471dce6af99f9cb235f94b730d8ce26a8c5..924477669aab9c46aae3d34f6fb54346b9ee591a 100644 (file)
--- a/tools/python/xen/xend/XendBase.py
+++ b/tools/python/xen/xend/XendBase.py
@@ -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 --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py
index 817a4df512bdc3ea386bdad7421c431f40669e55..30328c18c9af22aff622ff5d87885897dde1b634 100644 (file)
--- a/tools/python/xen/xm/main.py
+++ b/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 = {

diff --git a/tools/python/xen/xm/xenapi_create.py b/tools/python/xen/xm/xenapi_create.py
index f53a1770fd79efa8fe6335a91ea7acc3197a6693..eea256e74af80355085ac45d709ec714550e75ca 100644 (file)
--- a/tools/python/xen/xm/xenapi_create.py
+++ b/tools/python/xen/xm/xenapi_create.py
@@ -703,7 +703,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