From 7ba630eda22bd60483259b489f70780f8682d9af Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sat, 15 Oct 2016 17:40:58 +0200 Subject: [PATCH] Make xenserver_facts compile on python 3 Since the xenapi is not needed on python 2.4, we can use the regular exception handling code --- lib/ansible/modules/extras/cloud/xenserver_facts.py | 2 +- .../modules/extras/test/utils/shippable/sanity-skip-python3.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ansible/modules/extras/cloud/xenserver_facts.py b/lib/ansible/modules/extras/cloud/xenserver_facts.py index fdefee9f2e0..54a2bd61ec3 100644 --- a/lib/ansible/modules/extras/cloud/xenserver_facts.py +++ b/lib/ansible/modules/extras/cloud/xenserver_facts.py @@ -170,7 +170,7 @@ def main(): obj = XenServerFacts() try: session = get_xenapi_session() - except XenAPI.Failure, e: + except XenAPI.Failure as e: module.fail_json(msg='%s' % e) data = { diff --git a/lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt b/lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt index f5a2c57b676..debb6c46173 100644 --- a/lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt +++ b/lib/ansible/modules/extras/test/utils/shippable/sanity-skip-python3.txt @@ -40,7 +40,6 @@ /cloud/profitbricks/profitbricks.py /cloud/profitbricks/profitbricks_volume.py /cloud/rackspace/rax_clb_ssl.py -/cloud/xenserver_facts.py /clustering/consul.py /clustering/consul_acl.py /clustering/consul_kv.py