diff options
author | Michael Scherer <misc@zarb.org> | 2016-10-17 15:36:09 +0200 |
---|---|---|
committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-10-17 13:43:07 -0700 |
commit | 8dd32a8134f361185799368fce155393605175a3 (patch) | |
tree | 08a39f82f1371007f4b862eac57833c7430be2df | |
parent | 10405f94d77233f47b899689219db63933d67d7f (diff) | |
download | ansible-modules-extras-8dd32a8134f361185799368fce155393605175a3.tar.gz |
Make bigpanda module pass python3 sanity check
-rw-r--r-- | monitoring/bigpanda.py | 4 | ||||
-rw-r--r-- | test/utils/shippable/sanity-skip-python3.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/monitoring/bigpanda.py b/monitoring/bigpanda.py index df8e55fd..1365eb6a 100644 --- a/monitoring/bigpanda.py +++ b/monitoring/bigpanda.py @@ -170,11 +170,13 @@ def main(): module.exit_json(changed=True, **deployment) else: module.fail_json(msg=json.dumps(info)) - except Exception, e: + except Exception: + e = get_exception() module.fail_json(msg=str(e)) # import module snippets from ansible.module_utils.basic import * from ansible.module_utils.urls import * +from ansible.module_utils.pycompat24 import get_exception if __name__ == '__main__': main() diff --git a/test/utils/shippable/sanity-skip-python3.txt b/test/utils/shippable/sanity-skip-python3.txt index 052bf355..a15dd209 100644 --- a/test/utils/shippable/sanity-skip-python3.txt +++ b/test/utils/shippable/sanity-skip-python3.txt @@ -45,7 +45,6 @@ /database/vertica/vertica_role.py /database/vertica/vertica_schema.py /database/vertica/vertica_user.py -/monitoring/bigpanda.py /monitoring/boundary_meter.py /monitoring/circonus_annotation.py /monitoring/datadog_monitor.py |