diff options
author | Joe Stringer <joe@ovn.org> | 2016-05-23 18:20:30 -0700 |
---|---|---|
committer | Joe Stringer <joe@ovn.org> | 2016-06-07 16:18:45 -0700 |
commit | fc35b165519fe58d89cb019bc665745cb5e6c7ce (patch) | |
tree | fd21890cd07a4124227023c6874f4cf2c53ed318 /xenserver | |
parent | cb1e173762d69a54e7339542cd99a5784ccd85e6 (diff) | |
download | openvswitch-fc35b165519fe58d89cb019bc665745cb5e6c7ce.tar.gz |
xenserver: Use PEP 3110 exception syntax.
This syntax is usable with both python2.7 and python3, so use it instead
of the outdated syntax.
Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'xenserver')
3 files changed, 9 insertions, 9 deletions
diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py index 263007738..196c6863a 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py @@ -730,7 +730,7 @@ def mtu_setting(nw, type, oc): try: int(mtu) # Check that the value is an integer return mtu - except ValueError, x: + except ValueError as x: log("Invalid value for mtu = %s" % mtu) return None @@ -958,7 +958,7 @@ def DatapathFactory(): network_conf = open(root_prefix() + "/etc/xensource/network.conf", 'r') network_backend = network_conf.readline().strip() network_conf.close() - except Exception, e: + except Exception as e: raise Error("failed to determine network backend:" + e) if network_backend == "bridge": diff --git a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py index d9eda6adc..c65fb3da4 100644 --- a/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py +++ b/xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py @@ -54,7 +54,7 @@ def netdev_get_driver_name(netdev): symlink = '%s/sys/class/net/%s/device/driver' % (root_prefix(), netdev) try: target = os.readlink(symlink) - except OSError, e: + except OSError as e: log("%s: could not read netdev's driver name (%s)" % (netdev, e)) return None diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure index eab246c19..7bb456b3b 100755 --- a/xenserver/opt_xensource_libexec_interface-reconfigure +++ b/xenserver/opt_xensource_libexec_interface-reconfigure @@ -260,7 +260,7 @@ def ipdev_configure_static_routes(interface, oc, f): f.attach_child(child) child.close() - except ValueError, e: + except ValueError as e: log("Error in other-config['static-routes'] format for network %s: %s" % (interface, e)) def ipdev_open_ifcfg(pif): @@ -461,7 +461,7 @@ def action_up(pif, force): os.system(root_prefix() + "/sbin/update-issue") f.commit() - except Error, e: + except Error as e: log("failed to apply changes: %s" % e.msg) f.revert() raise @@ -575,7 +575,7 @@ def action_force_rewrite(bridge, config): try: f.apply() f.commit() - except Error, e: + except Error as e: log("failed to apply changes: %s" % e.msg) f.revert() raise @@ -606,7 +606,7 @@ def main(argv=None): "no-syslog", "help" ] arglist, args = getopt.gnu_getopt(argv[1:], shortops, longops) - except getopt.GetoptError, msg: + except getopt.GetoptError as msg: raise Usage(msg) force_rewrite_config = {} @@ -713,11 +713,11 @@ def main(argv=None): # Save cache. db().save(dbcache_file) - except Usage, err: + except Usage as err: print >>sys.stderr, err.msg print >>sys.stderr, "For help use --help." return 2 - except Error, err: + except Error as err: log(err.msg) return 1 |