ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-10-04 23:44:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixing Rackspace compile time errors irt exception handling for Python 3 (#3849)

Browse source
This commit is contained in:
@ 2016-06-03 06:39:59 -07:00 • committed by Matt Clay
commit 7e4b1ebff5
19 changed files with 94 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/cloud/rackspace/rax.py
View file

@ -291,7 +291,7 @@ def create(module, names=[], flavor=None, image=None, meta={}, key_name=None,
f = open(user_data)
user_data = f.read()
f.close()
except Exception, e:
except Exception as e:
module.fail_json(msg='Failed to load %s' % user_data)
# Handle the file contents
@ -301,7 +301,7 @@ def create(module, names=[], flavor=None, image=None, meta={}, key_name=None,
fileobj = open(lpath, 'r')
files[rpath] = fileobj.read()
fileobj.close()
except Exception, e:
except Exception as e:
module.fail_json(msg='Failed to load %s' % lpath)
try:
servers = []
@ -316,7 +316,7 @@ def create(module, names=[], flavor=None, image=None, meta={}, key_name=None,
userdata=user_data,
block_device_mapping_v2=bdmv2,
**extra_create_args))
except Exception, e:
except Exception as e:
if e.message:
msg = str(e.message)
else:
@ -398,7 +398,7 @@ def delete(module, instance_ids=[], wait=True, wait_timeout=300, kept=[]):
for server in servers:
try:
server.delete()
except Exception, e:
except Exception as e:
module.fail_json(msg=e.message)
else:
changed = True
@ -546,7 +546,7 @@ def cloudservers(module, state=None, name=None, flavor=None, image=None,
# %d to the end
try:
name % 0
except TypeError, e:
except TypeError as e:
if e.message.startswith('not all'):
name = '%s%%d' % name
else:
@ -636,7 +636,7 @@ def cloudservers(module, state=None, name=None, flavor=None, image=None,
# %d to the end
try:
name % 0
except TypeError, e:
except TypeError as e:
if e.message.startswith('not all'):
name = '%s%%d' % name
else: