From 18098ad055c3159adcbe1a151bbd1f3b71b653f5 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <a.badger@gmail.com>
Date: Wed, 8 Mar 2017 12:32:47 -0800
Subject: [PATCH] Make openvswitch* pass py3 sanity check

(cherry picked from 7f4fdba0c6ab1a00e8be2fc517173d898f305a23)

diff --git a/network/openvswitch_bridge.py b/network/openvswitch_bridge.py
index 68528dd..abe89df 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/network/openvswitch_port.py b/network/openvswitch_port.py
index c2224b5..d2bf31a 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()
-- 
2.9.3