summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorDirk Mueller <dirk@dmllr.de>2013-05-18 00:18:18 +0200
committerDirk Mueller <dirk@dmllr.de>2013-06-01 09:57:31 +0200
commitbf68a9592db4c90bc9421ce49c7c0766966d6e7e (patch)
tree0a02a49d60348af8cb74d9be59c7a961666b7f01 /nova/openstack
parent5a510518d9e3097730466cfbf4ff25495c4a0302 (diff)
downloadnova-bf68a9592db4c90bc9421ce49c7c0766966d6e7e.tar.gz
nova-bf68a9592db4c90bc9421ce49c7c0766966d6e7e.tar.xz
nova-bf68a9592db4c90bc9421ce49c7c0766966d6e7e.zip
Improve Python 3.x compatibility
Mechanical translation of the deprecated except x,y: construct with except x as y: The latter works with any Python >= 2.6. Add Hacking check. Change-Id: I845829d97d379c1cd9b3a77e7e5786586f263b64
Diffstat (limited to 'nova/openstack')
-rw-r--r--nova/openstack/common/processutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/openstack/common/processutils.py b/nova/openstack/common/processutils.py
index de6179602..87d89b490 100644
--- a/nova/openstack/common/processutils.py
+++ b/nova/openstack/common/processutils.py
@@ -203,7 +203,7 @@ def trycmd(*args, **kwargs):
try:
out, err = execute(*args, **kwargs)
failed = False
- except ProcessExecutionError, exn:
+ except ProcessExecutionError as exn:
out, err = '', str(exn)
failed = True