summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-02 14:26:15 +0000
committerGerrit Code Review <review@openstack.org>2013-07-02 14:26:15 +0000
commitb63e8d5241387b6e39690d18914f423c9c4b988a (patch)
tree42990701d5c07f2e1047aeb283d2d846c305e923 /openstackclient
parent674dd48ad9dd9609966e70d893e46c191245cdec (diff)
parent108f78d98994435fbd234196b3f23948b4c8bca6 (diff)
downloadpython-openstackclient-b63e8d5241387b6e39690d18914f423c9c4b988a.tar.gz
Merge "Remove python3 incompatible exception syntax."
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/compute/v2/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index a2496fad..8b134aa9 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -236,7 +236,7 @@ class CreateServer(show.ShowOne):
dst, src = f.split('=', 1)
try:
files[dst] = open(src)
- except IOError, e:
+ except IOError as e:
raise exceptions.CommandError("Can't open '%s': %s" % (src, e))
if parsed_args.min > parsed_args.max:
@@ -251,7 +251,7 @@ class CreateServer(show.ShowOne):
if parsed_args.user_data:
try:
userdata = open(parsed_args.user_data)
- except IOError, e:
+ except IOError as e:
raise exceptions.CommandError("Can't open '%s': %s" %
(parsed_args.user_data, e))