Adapt to python-2.6+, including support for 3.
Signed-off-by: Joe Stringer <j...@ovn.org>
---
utilities/ovs-dev.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py
index 0ba4280a8ddf..40cd43e14730 100755
--- a/utilities/ovs-dev.py
+++ b/utilities/ovs-dev.py
@@ -54,7 +54,7 @@ def _sh(*args, **kwargs):
def uname():
- return _sh("uname", "-r", capture=True)[0].strip()
+ return _sh("uname", "-r", capture=True)[0].decode().strip()
def sudo():
@@ -296,13 +296,13 @@ def modinst():
sudo()
try:
_sh("rmmod", "openvswitch")
- except subprocess.CalledProcessError, e:
+ except subprocess.CalledProcessError as e:
pass # Module isn't loaded
try:
_sh("rm -f /lib/modules/%s/extra/openvswitch.ko" % uname())
_sh("rm -f /lib/modules/%s/extra/vport-*.ko" % uname())
- except subprocess.CalledProcessError, e:
+ except subprocess.CalledProcessError as e:
pass # Module isn't installed
conf()
@@ -409,7 +409,7 @@ def main():
parser.add_option_group(group)
group = optparse.OptionGroup(parser, "Optimization Flags")
- for i in ["s", "g"] + range(4) + ["fast"]:
+ for i in ["s", "g"] + list(range(4)) + ["fast"]:
group.add_option("--O%s" % str(i), dest="optimize",
action="store_const", const=i,
help="compile with -O%s" % str(i))
--
2.8.2
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
