diff options
| -rwxr-xr-x | build-aux/extract-ofp-actions | 2 | ||||
| -rwxr-xr-x | build-aux/extract-ofp-errors | 2 | ||||
| -rwxr-xr-x | build-aux/extract-ofp-fields | 2 | ||||
| -rwxr-xr-x | ovsdb/ovsdb-idlc.in | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions index 874e6b4a7..c11297c60 100755 --- a/build-aux/extract-ofp-actions +++ b/build-aux/extract-ofp-actions @@ -13,7 +13,7 @@ version_map = {"1.0": 0x01, "1.3": 0x04, "1.4": 0x05, "1.5": 0x06} -version_reverse_map = dict((v, k) for (k, v) in version_map.iteritems()) +version_reverse_map = dict((v, k) for (k, v) in version_map.items()) # Map from vendor name to the length of the action header. vendor_map = {"OF": (0x00000000, 4), diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors index 336a2401f..71ae0bd5f 100755 --- a/build-aux/extract-ofp-errors +++ b/build-aux/extract-ofp-errors @@ -14,7 +14,7 @@ version_map = {"1.0": 0x01, "1.4": 0x05, "1.5": 0x06, "1.6": 0x07} -version_reverse_map = dict((v, k) for (k, v) in version_map.iteritems()) +version_reverse_map = dict((v, k) for (k, v) in version_map.items()) token = None line = "" diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields index 51cda4e0b..e4bb4dcb1 100755 --- a/build-aux/extract-ofp-fields +++ b/build-aux/extract-ofp-fields @@ -16,7 +16,7 @@ VERSION = {"1.0": 0x01, "1.3": 0x04, "1.4": 0x05, "1.5": 0x06} -VERSION_REVERSE = dict((v,k) for k, v in VERSION.iteritems()) +VERSION_REVERSE = dict((v,k) for k, v in VERSION.items()) TYPES = {"u8": (1, False), "be16": (2, False), diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in index 3fa1a0f1a..615548f12 100755 --- a/ovsdb/ovsdb-idlc.in +++ b/ovsdb/ovsdb-idlc.in @@ -138,7 +138,7 @@ def printCIDLHeader(schemaFile): #include "smap.h" #include "uuid.h"''' % {'prefix': prefix.upper()}) - for tableName, table in sorted(schema.tables.iteritems()): + for tableName, table in sorted(schema.tables.items()): structName = "%s%s" % (prefix, tableName.lower()) print(" ") @@ -300,7 +300,7 @@ def printCIDLSource(schemaFile): ''' % schema.idlHeader) # Cast functions. - for tableName, table in sorted(schema.tables.iteritems()): + for tableName, table in sorted(schema.tables.items()): structName = "%s%s" % (prefix, tableName.lower()) print(''' static struct %(s)s * @@ -311,7 +311,7 @@ static struct %(s)s * ''' % {'s': structName}) - for tableName, table in sorted(schema.tables.iteritems()): + for tableName, table in sorted(schema.tables.items()): structName = "%s%s" % (prefix, tableName.lower()) print(" ") print("/* %s table. */" % (tableName)) @@ -1025,7 +1025,7 @@ void # Table classes. print(" ") print("struct ovsdb_idl_table_class %stable_classes[%sN_TABLES] = {" % (prefix, prefix.upper())) - for tableName, table in sorted(schema.tables.iteritems()): + for tableName, table in sorted(schema.tables.items()): structName = "%s%s" % (prefix, tableName.lower()) if table.is_root: is_root = "true" |