internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

reword "except Error as e:" into "except Error, e:" to be compatible with Python 2.5 (#5852)

Browse Source
This commit is contained in:
Timur Batyrshin
2014-02-02 21:33:27 +04:00
committed by James Cammarata
parent 2d0e9cd75d
commit 658c15930e
27 changed files with 118 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/cloud/ec2
View File

@@ -619,7 +619,7 @@ def create_instances(module, ec2):
try:
res.connection.get_all_instances(instids)
break
except boto.exception.EC2ResponseError as e:
except boto.exception.EC2ResponseError, e:
if "<Code>InvalidInstanceID.NotFound</Code>" in str(e):
# there's a race between start and get an instance
continue
@@ -629,7 +629,7 @@ def create_instances(module, ec2):
if instance_tags:
try:
ec2.create_tags(instids, instance_tags)
except boto.exception.EC2ResponseError as e:
except boto.exception.EC2ResponseError, e:
module.fail_json(msg = "%s: %s" % (e.error_code, e.error_message))
# wait here until the instances are up
@@ -703,7 +703,7 @@ def terminate_instances(module, ec2, instance_ids):
instance_dict_array.append(get_instance_info(inst))
try:
ec2.terminate_instances([inst.id])
except EC2ResponseError as e:
except EC2ResponseError, e:
module.fail_json(msg='Unable to terminate instance {0}, error: {1}'.format(inst.id, e))
changed = True
@@ -773,7 +773,7 @@ def startstop_instances(module, ec2, instance_ids):
inst.start()
else:
inst.stop()
except EC2ResponseError as e:
except EC2ResponseError, e:
module.fail_json(msg='Unable to change state for instance {0}, error: {1}'.format(inst.id, e))
changed = True