cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Adapt exception syntax to work under python3 in s3_bucket.py

Browse source 
Signed-off-by: Javier M. Mellid <jmunhoz@igalia.com>
This commit is contained in:
Javier M. Mellid 2016-06-18 00:06:13 +02:00
parent a87b2e38a0
commit 78b4829623
1 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
cloud/amazon/s3_bucket.py
View file

@ -151,11 +151,11 @@ def _create_bucket(connection, module, location):
try:
bucket = connection.get_bucket(name)
except S3ResponseError, e:
except S3ResponseError as e:
try:
bucket = connection.create_bucket(name, location=location)
changed = True
except S3CreateError, e:
except S3CreateError as e:
module.fail_json(msg=e.message)
# Versioning
@ -165,7 +165,7 @@ def _create_bucket(connection, module, location):
bucket.configure_versioning(versioning)
changed = True
versioning_status = bucket.get_versioning_status()
except S3ResponseError, e:
except S3ResponseError as e:
module.fail_json(msg=e.message)
elif not versioning_status and not versioning:
# do nothing
@ -195,7 +195,7 @@ def _create_bucket(connection, module, location):
# Policy
try:
current_policy = bucket.get_policy()
except S3ResponseError, e:
except S3ResponseError as e:
if e.error_code == "NoSuchBucketPolicy":
current_policy = None
else:
@ -210,7 +210,7 @@ def _create_bucket(connection, module, location):
bucket.set_policy(policy)
changed = True
current_policy = bucket.get_policy()
except S3ResponseError, e:
except S3ResponseError as e:
module.fail_json(msg=e.message)
elif current_policy is None and policy is not None:
@ -220,7 +220,7 @@ def _create_bucket(connection, module, location):
bucket.set_policy(policy)
changed = True
current_policy = bucket.get_policy()
except S3ResponseError, e:
except S3ResponseError as e:
module.fail_json(msg=e.message)
elif current_policy is not None and policy is None:
@ -228,7 +228,7 @@ def _create_bucket(connection, module, location):
bucket.delete_policy()
changed = True
current_policy = bucket.get_policy()
except S3ResponseError, e:
except S3ResponseError as e:
if e.error_code == "NoSuchBucketPolicy":
current_policy = None
else:
@ -242,7 +242,7 @@ def _create_bucket(connection, module, location):
try:
current_tags = bucket.get_tags()
tag_set = TagSet()
except S3ResponseError, e:
except S3ResponseError as e:
if e.error_code == "NoSuchTagSet":
current_tags = None
else:
@ -263,7 +263,7 @@ def _create_bucket(connection, module, location):
bucket.delete_tags()
current_tags_dict = tags
changed = True
except S3ResponseError, e:
except S3ResponseError as e:
module.fail_json(msg=e.message)
module.exit_json(changed=changed, name=bucket.name, versioning=versioning_status, requester_pays=requester_pays_status, policy=current_policy, tags=current_tags_dict)
@ -276,7 +276,7 @@ def _destroy_bucket(connection, module):
try:
bucket = connection.get_bucket(name)
except S3ResponseError, e:
except S3ResponseError as e:
if e.error_code != "NoSuchBucket":
module.fail_json(msg=e.message)
else:
@ -289,13 +289,13 @@ def _destroy_bucket(connection, module):
for key in bucket.list():
key.delete()
except BotoServerError, e:
except BotoServerError as e:
module.fail_json(msg=e.message)
try:
bucket = connection.delete_bucket(name)
changed = True
except S3ResponseError, e:
except S3ResponseError as e:
module.fail_json(msg=e.message)
module.exit_json(changed=changed)
@ -308,11 +308,11 @@ def _create_bucket_ceph(connection, module, location):
try:
bucket = connection.get_bucket(name)
except S3ResponseError, e:
except S3ResponseError as e:
try:
bucket = connection.create_bucket(name, location=location)
changed = True
except S3CreateError, e:
except S3CreateError as e:
module.fail_json(msg=e.message)
module.exit_json(changed=changed)
@ -426,9 +426,9 @@ def main():
if connection is None:
connection = boto.connect_s3(**aws_connect_params)
except boto.exception.NoAuthHandlerFound, e:
except boto.exception.NoAuthHandlerFound as e:
module.fail_json(msg='No Authentication Handler found: %s ' % str(e))
except Exception, e:
except Exception as e:
module.fail_json(msg='Failed to connect to S3: %s' % str(e))
if connection is None: # this should never happen