Make openvswitch* pass py3 sanity check

dimagi · Dec 8, 2016 · 7f4fdba · 7f4fdba
1 parent 2a83eef
commit 7f4fdba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/lib/ansible/modules/extras/network/openvswitch_bridge.py b/lib/ansible/modules/extras/network/openvswitch_bridge.py
@@ -143,7 +143,8 @@ def check(self):
                 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 @@ def run(self):
                            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
@@ -204,7 +204,8 @@ def check(self):
                 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 @@ def run(self):
                         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
@@ -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