From d4c5cd1d939ac9bc8f4e2065e5afa83b1fa00418 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 5 Jun 2018 09:47:35 -0400 Subject: openvswitch: remove unused patches commit 1fd1ff372014 [openvswitch: uprev to v2.9.2] left a bunch of unused patches in place. Remove unreferenced patches as they are no longer needed. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- ...0007-Python3-compatibility-unicode-to-str.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch (limited to 'recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch') diff --git a/recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch b/recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch deleted file mode 100644 index 753490f8..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/0007-Python3-compatibility-unicode-to-str.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c78b39ae9ba6337210d6a9e4ccc4753cb1c3b48f Mon Sep 17 00:00:00 2001 -From: Jason Wessel -Date: Thu, 29 Jun 2017 20:33:23 -0700 -Subject: [PATCH] Python3 compatibility: unicode to str - -Commit 7430959d4ad17db89b8387c3aef58c8b230cad10 from -https://github.com/openvswitch/ovs.git - -When transitioning from python2 to python3 the following type class -changes occured: - -python2 -> python3 -unicode -> str -str -> bytes - -That means we have to check the python version and do the right type -check python3 will throw an error when it tries to use the unicode -type because it doesn't exist. - -Signed-off-by: Jason Wessel -Signed-off-by: Ben Pfaff - ---- - ovsdb/ovsdb-doc | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc -index 9448713..d55c6e6 100755 ---- a/ovsdb/ovsdb-doc -+++ b/ovsdb/ovsdb-doc -@@ -65,9 +65,15 @@ def columnGroupToNroff(table, groupXml, documented_columns): - if node.hasAttribute('type'): - type_string = node.attributes['type'].nodeValue - type_json = ovs.json.from_string(str(type_string)) -- if type(type_json) in (str, unicode): -- raise error.Error("%s %s:%s has invalid 'type': %s" -- % (table.name, name, key, type_json)) -+ # py2 -> py3 means str -> bytes and unicode -> str -+ try: -+ if type(type_json) in (str, unicode): -+ raise error.Error("%s %s:%s has invalid 'type': %s" -+ % (table.name, name, key, type_json)) -+ except: -+ if type(type_json) in (bytes, str): -+ raise error.Error("%s %s:%s has invalid 'type': %s" -+ % (table.name, name, key, type_json)) - type_ = ovs.db.types.BaseType.from_json(type_json) - else: - type_ = column.type.value -- cgit v1.2.3-54-g00ecf