Fix amazon extras modules to compile under python3

This commit is contained in:
Toshio Kuratomi
2016-10-23 13:41:03 -07:00
committed by Matt Clay
parent 46a1f73778
commit 3901fe72d3
31 changed files with 192 additions and 190 deletions

View File

@@ -103,6 +103,9 @@ EXAMPLES = '''
state: absent
'''
import json
import traceback
try:
import boto.sqs
from boto.exception import BotoServerError, NoAuthHandlerFound
@@ -111,6 +114,9 @@ try:
except ImportError:
HAS_BOTO = False
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.ec2 import AnsibleAWSError, connect_to_aws, ec2_argument_spec, get_aws_connection_info
def create_or_update_sqs_queue(connection, module):
queue_name = module.params.get('name')
@@ -255,7 +261,7 @@ def main():
try:
connection = connect_to_aws(boto.sqs, region, **aws_connect_params)
except (NoAuthHandlerFound, AnsibleAWSError), e:
except (NoAuthHandlerFound, AnsibleAWSError) as e:
module.fail_json(msg=str(e))
state = module.params.get('state')
@@ -265,9 +271,5 @@ def main():
delete_sqs_queue(connection, module)
# import module snippets
from ansible.module_utils.basic import *
from ansible.module_utils.ec2 import *
if __name__ == '__main__':
main()