From 7f4fdba0c6ab1a00e8be2fc517173d898f305a23 Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Tue, 18 Oct 2016 18:14:02 +0200 Subject: [PATCH] Make openvswitch* pass py3 sanity check --- lib/ansible/modules/extras/network/openvswitch_bridge.py | 7 +++++-- lib/ansible/modules/extras/network/openvswitch_port.py | 7 +++++-- .../extras/test/utils/shippable/sanity-skip-python3.txt | 2 -- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/ansible/modules/extras/network/openvswitch_bridge.py b/lib/ansible/modules/extras/network/openvswitch_bridge.py index 68528dd478..abe89dfdd4 100644 --- a/lib/ansible/modules/extras/network/openvswitch_bridge.py +++ b/lib/ansible/modules/extras/network/openvswitch_bridge.py @@ -143,7 +143,8 @@ class OVSBridge(object): changed = True elif self.state == 'present' and not self.exists(): changed = True - except Exception, earg: + except Exception: + earg = get_exception() self.module.fail_json(msg=str(earg)) # pylint: enable=W0703 @@ -189,7 +190,8 @@ class OVSBridge(object): self.set_external_id(key, None)): changed = True - except Exception, earg: + except Exception: + earg = get_exception() self.module.fail_json(msg=str(earg)) # pylint: enable=W0703 self.module.exit_json(changed=changed) @@ -267,4 +269,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * +from ansible.module_utils.pycompat24 import get_exception main() diff --git a/lib/ansible/modules/extras/network/openvswitch_port.py b/lib/ansible/modules/extras/network/openvswitch_port.py index d23fdc2838..31d38ae843 100644 --- a/lib/ansible/modules/extras/network/openvswitch_port.py +++ b/lib/ansible/modules/extras/network/openvswitch_port.py @@ -204,7 +204,8 @@ class OVSPort(object): changed = True else: changed = False - except Exception, earg: + except Exception: + earg = get_exception() self.module.fail_json(msg=str(earg)) self.module.exit_json(changed=changed) @@ -235,7 +236,8 @@ class OVSPort(object): external_id = fmt_opt % (self.port, key, value) changed = self.set(external_id) or changed ## - except Exception, earg: + except Exception: + earg = get_exception() self.module.fail_json(msg=str(earg)) self.module.exit_json(changed=changed) @@ -269,4 +271,5 @@ def main(): # import module snippets from ansible.module_utils.basic import * +from ansible.module_utils.pycompat24 import get_exception main() 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 795d92d4b8..4831e17134 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 @@ -51,5 +51,3 @@ /network/f5/bigip_gtm_virtual_server.py /network/f5/bigip_gtm_wide_ip.py /network/nmcli.py -/network/openvswitch_bridge.py -/network/openvswitch_port.py