ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

[cloud] fix exception examples in AWS guidelines to be compatible with python3 (#26948)

Browse source
This commit is contained in:
Sloane Hertel 2017-07-18 09:35:19 -04:00 committed by Ryan Brown
parent a5c41dcd49
commit cdd1a147f1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/modules/cloud/amazon/GUIDELINES.md
View file

@ -120,7 +120,7 @@ region, ec2_url, aws_connect_params = get_aws_connection_info(module)
if region: if region:
try: try:
connection = connect_to_aws(boto.ec2, region, **aws_connect_params) connection = connect_to_aws(boto.ec2, region, **aws_connect_params)
except (boto.exception.NoAuthHandlerFound, AnsibleAWSError), e: except (boto.exception.NoAuthHandlerFound, AnsibleAWSError) as e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))
else: else:
module.fail_json(msg="region must be specified") module.fail_json(msg="region must be specified")
@ -161,7 +161,7 @@ except ImportError:
# Make a call to AWS # Make a call to AWS
try: try:
result = connection.aws_call() result = connection.aws_call()
except BotoServerError, e: except BotoServerError as e:
module.fail_json(msg="helpful message here", exception=traceback.format_exc(), module.fail_json(msg="helpful message here", exception=traceback.format_exc(),
**camel_dict_to_snake_dict(e.message)) **camel_dict_to_snake_dict(e.message))
``` ```
@ -186,7 +186,7 @@ except ImportError:
# Make a call to AWS # Make a call to AWS
try: try:
result = connection.aws_call() result = connection.aws_call()
except ClientError, e: except ClientError as e:
module.fail_json(msg=e.message, exception=traceback.format_exc(), module.fail_json(msg=e.message, exception=traceback.format_exc(),
**camel_dict_to_snake_dict(e.response)) **camel_dict_to_snake_dict(e.response))
``` ```
@ -197,7 +197,7 @@ If you need to perform an action based on the error boto3 returned, use the erro
# Make a call to AWS # Make a call to AWS
try: try:
result = connection.aws_call() result = connection.aws_call()
except ClientError, e: except ClientError as e:
if e.response['Error']['Code'] == 'NoSuchEntity': if e.response['Error']['Code'] == 'NoSuchEntity':
return None return None
else: else: