From 2ceb672016c6e8bbba1b1201cb7cf1bb391ee982 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Mon, 17 Oct 2016 15:44:20 +0200 Subject: [PATCH] Fix dnsmadeeasy module to pass py3 sanity check --- lib/ansible/modules/extras/network/dnsmadeeasy.py | 5 +++-- .../extras/test/utils/shippable/sanity-skip-python3.txt | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ansible/modules/extras/network/dnsmadeeasy.py b/lib/ansible/modules/extras/network/dnsmadeeasy.py index 9b77b21d4cf..20a82707b84 100644 --- a/lib/ansible/modules/extras/network/dnsmadeeasy.py +++ b/lib/ansible/modules/extras/network/dnsmadeeasy.py @@ -121,7 +121,8 @@ try: from time import strftime, gmtime import hashlib import hmac -except ImportError, e: +except ImportError: + e = get_exception() IMPORT_ERROR = str(e) class DME2: @@ -170,7 +171,7 @@ class DME2: try: return json.load(response) - except Exception, e: + except Exception: return {} def getDomain(self, domain_id): 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 bfeeff78744..b1e2e756066 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 @@ -58,7 +58,6 @@ /monitoring/stackdriver.py /network/citrix/netscaler.py /network/cloudflare_dns.py -/network/dnsmadeeasy.py /network/f5/bigip_gtm_virtual_server.py /network/f5/bigip_gtm_wide_ip.py /network/nmcli.py