1 files changed, 0 insertions, 77 deletions
diff --git a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch b/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch
deleted file mode 100644
index 70abd263d..000000000
--- a/import-layers/meta-virtualization/recipes-networking/openvswitch/openvswitch-git/0002-Python3-compatibility-exception-cleanup.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c0ba116eab401431b4f11b66bd7d1b42741b03c3 Mon Sep 17 00:00:00 2001
-From: Jason Wessel <jason.wessel@windriver.com>
-Date: Thu, 29 Jun 2017 20:33:23 -0700
-Subject: [PATCH] Python3 compatibility: exception cleanup
-
-Commit 52e4a477f0b3c0a0ece7adeede6e06e07814f8b9 from
-https://github.com/openvswitch/ovs.git
-
-The exception syntax which is compatible with python2 and python3 is
-to use the "as" form for "except:".
-
-Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
-Signed-off-by: Ben Pfaff <blp@ovn.org>
-
----
- build-aux/extract-ofp-fields | 2 +-
- ovsdb/ovsdb-doc              | 4 ++--
- ovsdb/ovsdb-idlc.in          | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
-index 80c7d35..6286c9c 100755
---- a/build-aux/extract-ofp-fields
-+++ b/build-aux/extract-ofp-fields
-@@ -784,7 +784,7 @@ if __name__ == "__main__":
-     try:
-         options, args = getopt.gnu_getopt(sys.argv[1:], 'h',
-                                           ['help', 'ovs-version='])
--    except getopt.GetoptError, geo:
-+    except getopt.GetoptError as geo:
-         sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
-         sys.exit(1)
- 
-diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc
-index e82ad59..9448713 100755
---- a/ovsdb/ovsdb-doc
-+++ b/ovsdb/ovsdb-doc
-@@ -278,7 +278,7 @@ if __name__ == "__main__":
-             options, args = getopt.gnu_getopt(sys.argv[1:], 'hV',
-                                               ['er-diagram=',
-                                                'version=', 'help'])
--        except getopt.GetoptError, geo:
-+        except getopt.GetoptError as geo:
-             sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
-             sys.exit(1)
- 
-@@ -306,7 +306,7 @@ if __name__ == "__main__":
-             if len(line):
-                 print(line)
- 
--    except error.Error, e:
-+    except error.Error as e:
-         sys.stderr.write("%s: %s\n" % (argv0, e.msg))
-         sys.exit(1)
- 
-diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
-index 62442ee..e7e1c6b 100755
---- a/ovsdb/ovsdb-idlc.in
-+++ b/ovsdb/ovsdb-idlc.in
-@@ -1098,7 +1098,7 @@ if __name__ == "__main__":
-                                               ['directory',
-                                                'help',
-                                                'version'])
--        except getopt.GetoptError, geo:
-+        except getopt.GetoptError as geo:
-             sys.stderr.write("%s: %s\n" % (argv0, geo.msg))
-             sys.exit(1)
- 
-@@ -1136,7 +1136,7 @@ if __name__ == "__main__":
-             sys.exit(1)
- 
-         func(*args[1:])
--    except ovs.db.error.Error, e:
-+    except ovs.db.error.Error as e:
-         sys.stderr.write("%s: %s\n" % (argv0, e))
-         sys.exit(1)
-