wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port rax.py to python3 compatible syntax (#15875)

Browse source 
Since the pyrax website say that only python 2.7 is tested,
I do not think it is worth to aim for python 2.4 compatibility
for the various rackspace modules.
This commit is contained in:
Michael Scherer 2016-05-17 02:30:25 +02:00 committed by Toshio Kuratomi
parent 376fc21f92
commit fb2355e47d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/module_utils/rax.py
View file

@ -163,7 +163,7 @@ def rax_find_volume(module, rax_module, name):
volume = cbs.find(name=name)
except rax_module.exc.NotFound:
volume = None
except Exception, e:
except Exception as e:
module.fail_json(msg='%s' % e)
return volume
@ -302,7 +302,7 @@ def setup_rax_module(module, rax_module, region_required=True):
os.environ.get('RAX_CREDS_FILE'))
region = (region or os.environ.get('RAX_REGION') or
rax_module.get_setting('region'))
except KeyError, e:
except KeyError as e:
module.fail_json(msg='Unable to load %s' % e.message)
try:
@ -317,7 +317,7 @@ def setup_rax_module(module, rax_module, region_required=True):
rax_module.set_credential_file(credentials, region=region)
else:
raise Exception('No credentials supplied!')
except Exception, e:
except Exception as e:
if e.message:
msg = str(e.message)
else: