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

Make xenserver_facts compile on python 3

Browse source 
Since the xenapi is not needed on python 2.4, we can use the
regular exception handling code
This commit is contained in:
Michael Scherer 2016-10-15 17:40:58 +02:00 committed by Matt Clay
parent 9f5f85c9f0
commit 7ba630eda2
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/extras/cloud/xenserver_facts.py
View file

@ -170,7 +170,7 @@ def main():
obj = XenServerFacts() obj = XenServerFacts()
try: try:
session = get_xenapi_session() session = get_xenapi_session()
except XenAPI.Failure, e: except XenAPI.Failure as e:
module.fail_json(msg='%s' % e) module.fail_json(msg='%s' % e)
data = { data = {

1
lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt
View file

@ -40,7 +40,6 @@
/cloud/profitbricks/profitbricks.py /cloud/profitbricks/profitbricks.py
/cloud/profitbricks/profitbricks_volume.py /cloud/profitbricks/profitbricks_volume.py
/cloud/rackspace/rax_clb_ssl.py /cloud/rackspace/rax_clb_ssl.py
/cloud/xenserver_facts.py
/clustering/consul.py /clustering/consul.py
/clustering/consul_acl.py /clustering/consul_acl.py
/clustering/consul_kv.py /clustering/consul_kv.py