diff options
| author | Michael Scherer <mscherer@users.noreply.github.com> | 2016-10-14 16:36:58 +0200 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2016-10-14 07:36:58 -0700 |
| commit | 32b1d9c4f8d682e1cec35fbf5d166602ff53ce8f (patch) | |
| tree | 865273b5cf521a803060c910e2b0ffec3e3d648c | |
| parent | 39c5421c43fd350c0aab98cea017a61a01aab889 (diff) | |
| download | ansible-modules-extras-32b1d9c4f8d682e1cec35fbf5d166602ff53ce8f.tar.gz | |
Port virt to python3 (#3167)
| -rw-r--r-- | cloud/misc/virt.py | 4 | ||||
| -rw-r--r-- | test/utils/shippable/sanity-skip-python3.txt | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cloud/misc/virt.py b/cloud/misc/virt.py index be1a7f9e..68ff4a6c 100644 --- a/cloud/misc/virt.py +++ b/cloud/misc/virt.py @@ -510,7 +510,8 @@ def main(): rc = VIRT_SUCCESS try: rc, result = core(module) - except Exception, e: + except Exception: + e = get_exception() module.fail_json(msg=str(e)) if rc != 0: # something went wrong emit the msg @@ -521,4 +522,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * +from ansible.module_utils.pycompat24 import get_exception main() diff --git a/test/utils/shippable/sanity-skip-python3.txt b/test/utils/shippable/sanity-skip-python3.txt index 94524fa8..7cce932e 100644 --- a/test/utils/shippable/sanity-skip-python3.txt +++ b/test/utils/shippable/sanity-skip-python3.txt @@ -36,7 +36,6 @@ /cloud/misc/ovirt.py /cloud/misc/proxmox.py /cloud/misc/proxmox_template.py -/cloud/misc/virt.py /cloud/misc/virt_net.py /cloud/misc/virt_pool.py /cloud/profitbricks/profitbricks.py |