diff options
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch')
| -rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch b/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch deleted file mode 100644 index 092c42d6..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/0004-Python3-compatibility-iteritems-to-items.patch +++ /dev/null | |||
| @@ -1,100 +0,0 @@ | |||
| 1 | From 7e4bd5c2af85b1293be0a92b18f7930bda2ab41a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Jason Wessel <jason.wessel@windriver.com> | ||
| 3 | Date: Thu, 29 Jun 2017 20:33:23 -0700 | ||
| 4 | Subject: [PATCH] Python3 compatibility: iteritems to items | ||
| 5 | |||
| 6 | Commit 4ab665623cbb4c6506e48b82e0c9fe8585f42e13 from | ||
| 7 | https://github.com/openvswitch/ovs.git | ||
| 8 | |||
| 9 | Allow compability with python3 and python2 by changing iteritems() to | ||
| 10 | items(). | ||
| 11 | |||
| 12 | Signed-off-by: Jason Wessel <jason.wessel@windriver.com> | ||
| 13 | Signed-off-by: Ben Pfaff <blp@ovn.org> | ||
| 14 | |||
| 15 | --- | ||
| 16 | build-aux/extract-ofp-actions | 2 +- | ||
| 17 | build-aux/extract-ofp-errors | 2 +- | ||
| 18 | build-aux/extract-ofp-fields | 2 +- | ||
| 19 | ovsdb/ovsdb-idlc.in | 8 ++++---- | ||
| 20 | 4 files changed, 7 insertions(+), 7 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions | ||
| 23 | index 67e3848..c7858bd 100755 | ||
| 24 | --- a/build-aux/extract-ofp-actions | ||
| 25 | +++ b/build-aux/extract-ofp-actions | ||
| 26 | @@ -13,7 +13,7 @@ version_map = {"1.0": 0x01, | ||
| 27 | "1.3": 0x04, | ||
| 28 | "1.4": 0x05, | ||
| 29 | "1.5": 0x06} | ||
| 30 | -version_reverse_map = dict((v, k) for (k, v) in version_map.iteritems()) | ||
| 31 | +version_reverse_map = dict((v, k) for (k, v) in version_map.items()) | ||
| 32 | |||
| 33 | # Map from vendor name to the length of the action header. | ||
| 34 | vendor_map = {"OF": (0x00000000, 4), | ||
| 35 | diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors | ||
| 36 | index 97d62d2..58ba006 100755 | ||
| 37 | --- a/build-aux/extract-ofp-errors | ||
| 38 | +++ b/build-aux/extract-ofp-errors | ||
| 39 | @@ -14,7 +14,7 @@ version_map = {"1.0": 0x01, | ||
| 40 | "1.4": 0x05, | ||
| 41 | "1.5": 0x06, | ||
| 42 | "1.6": 0x07} | ||
| 43 | -version_reverse_map = dict((v, k) for (k, v) in version_map.iteritems()) | ||
| 44 | +version_reverse_map = dict((v, k) for (k, v) in version_map.items()) | ||
| 45 | |||
| 46 | token = None | ||
| 47 | line = "" | ||
| 48 | diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields | ||
| 49 | index 6286c9c..f624728 100755 | ||
| 50 | --- a/build-aux/extract-ofp-fields | ||
| 51 | +++ b/build-aux/extract-ofp-fields | ||
| 52 | @@ -16,7 +16,7 @@ VERSION = {"1.0": 0x01, | ||
| 53 | "1.3": 0x04, | ||
| 54 | "1.4": 0x05, | ||
| 55 | "1.5": 0x06} | ||
| 56 | -VERSION_REVERSE = dict((v,k) for k, v in VERSION.iteritems()) | ||
| 57 | +VERSION_REVERSE = dict((v,k) for k, v in VERSION.items()) | ||
| 58 | |||
| 59 | TYPES = {"u8": (1, False), | ||
| 60 | "be16": (2, False), | ||
| 61 | diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in | ||
| 62 | index e1551f9..b70a599 100755 | ||
| 63 | --- a/ovsdb/ovsdb-idlc.in | ||
| 64 | +++ b/ovsdb/ovsdb-idlc.in | ||
| 65 | @@ -138,7 +138,7 @@ def printCIDLHeader(schemaFile): | ||
| 66 | #include "smap.h" | ||
| 67 | #include "uuid.h"''' % {'prefix': prefix.upper()}) | ||
| 68 | |||
| 69 | - for tableName, table in sorted(schema.tables.iteritems()): | ||
| 70 | + for tableName, table in sorted(schema.tables.items()): | ||
| 71 | structName = "%s%s" % (prefix, tableName.lower()) | ||
| 72 | |||
| 73 | print("") | ||
| 74 | @@ -300,7 +300,7 @@ def printCIDLSource(schemaFile): | ||
| 75 | ''' % schema.idlHeader) | ||
| 76 | |||
| 77 | # Cast functions. | ||
| 78 | - for tableName, table in sorted(schema.tables.iteritems()): | ||
| 79 | + for tableName, table in sorted(schema.tables.items()): | ||
| 80 | structName = "%s%s" % (prefix, tableName.lower()) | ||
| 81 | print(''' | ||
| 82 | static struct %(s)s * | ||
| 83 | @@ -311,7 +311,7 @@ static struct %(s)s * | ||
| 84 | ''' % {'s': structName}) | ||
| 85 | |||
| 86 | |||
| 87 | - for tableName, table in sorted(schema.tables.iteritems()): | ||
| 88 | + for tableName, table in sorted(schema.tables.items()): | ||
| 89 | structName = "%s%s" % (prefix, tableName.lower()) | ||
| 90 | print("") | ||
| 91 | print("/* %s table. */" % (tableName)) | ||
| 92 | @@ -1025,7 +1025,7 @@ void | ||
| 93 | # Table classes. | ||
| 94 | print("") | ||
| 95 | print("struct ovsdb_idl_table_class %stable_classes[%sN_TABLES] = {" % (prefix, prefix.upper())) | ||
| 96 | - for tableName, table in sorted(schema.tables.iteritems()): | ||
| 97 | + for tableName, table in sorted(schema.tables.items()): | ||
| 98 | structName = "%s%s" % (prefix, tableName.lower()) | ||
| 99 | if table.is_root: | ||
| 100 | is_root = "true" | ||
