[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 02/14] qapi: use items()/values() intead of iteri
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v5 02/14] qapi: use items()/values() intead of iteritems()/itervalues() |
Date: |
Tue, 16 Jan 2018 13:42:05 +0000 |
The iteritems()/itervalues() methods are gone in py3, but the
items()/values() methods are still around. The latter are less
efficient than the former in py2, but this has unmeasurably
small impact on QEMU build time, so taking portability over
efficiency is a net win.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
scripts/qapi.py | 12 ++++++------
scripts/qapi2texi.py | 2 +-
tests/qapi-schema/test-qapi.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 64fde4b6c5..98d7123d27 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -245,7 +245,7 @@ class QAPIDoc(object):
"'Returns:' is only valid for commands")
def check(self):
- bogus = [name for name, section in self.args.iteritems()
+ bogus = [name for name, section in self.args.items()
if not section.member]
if bogus:
raise QAPISemError(
@@ -300,7 +300,7 @@ class QAPISchemaParser(object):
if not isinstance(pragma, dict):
raise QAPISemError(
info, "Value of 'pragma' must be a dictionary")
- for name, value in pragma.iteritems():
+ for name, value in pragma.items():
self._pragma(name, value, info)
else:
expr_elem = {'expr': expr,
@@ -1566,7 +1566,7 @@ class QAPISchema(object):
def _make_members(self, data, info):
return [self._make_member(key, value, info)
- for (key, value) in data.iteritems()]
+ for (key, value) in data.items()]
def _def_struct_type(self, expr, info, doc):
name = expr['struct']
@@ -1598,11 +1598,11 @@ class QAPISchema(object):
name, info, doc, 'base', self._make_members(base, info)))
if tag_name:
variants = [self._make_variant(key, value)
- for (key, value) in data.iteritems()]
+ for (key, value) in data.items()]
members = []
else:
variants = [self._make_simple_variant(key, value, info)
- for (key, value) in data.iteritems()]
+ for (key, value) in data.items()]
typ = self._make_implicit_enum_type(name, info,
[v.name for v in variants])
tag_member = QAPISchemaObjectTypeMember('type', typ, False)
@@ -1617,7 +1617,7 @@ class QAPISchema(object):
name = expr['alternate']
data = expr['data']
variants = [self._make_variant(key, value)
- for (key, value) in data.iteritems()]
+ for (key, value) in data.items()]
tag_member = QAPISchemaObjectTypeMember('type', 'QType', False)
self._def_entity(
QAPISchemaAlternateType(name, info, doc,
diff --git a/scripts/qapi2texi.py b/scripts/qapi2texi.py
index 70e1fe76ef..bf1c57b2e2 100755
--- a/scripts/qapi2texi.py
+++ b/scripts/qapi2texi.py
@@ -146,7 +146,7 @@ def texi_member(member, suffix=''):
def texi_members(doc, what, base, variants, member_func):
"""Format the table of members"""
items = ''
- for section in doc.args.itervalues():
+ for section in doc.args.values():
# TODO Drop fallbacks when undocumented members are outlawed
if section.text:
desc = texi_format(section.text)
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
index a43fa873e1..ac43d3458e 100644
--- a/tests/qapi-schema/test-qapi.py
+++ b/tests/qapi-schema/test-qapi.py
@@ -63,7 +63,7 @@ for doc in schema.docs:
else:
print('doc freeform')
print(' body=\n%s' % doc.body.text)
- for arg, section in doc.args.iteritems():
+ for arg, section in doc.args.items():
print(' arg=%s\n%s' % (arg, section.text))
for section in doc.sections:
print(' section=%s\n%s' % (section.name, section.text))
--
2.14.3
- [Qemu-devel] [PATCH v5 00/14] Support building with py2 or py3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 01/14] qapi: convert to use python print function instead of statement, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 02/14] qapi: use items()/values() intead of iteritems()/itervalues(),
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v5 03/14] qapi: Use OrderedDict from standard library if available, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 04/14] qapi: adapt to moved location of StringIO module in py3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 05/14] qapi: Adapt to moved location of 'maketrans' function in py3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 06/14] qapi: remove '-q' arg to diff when comparing QAPI output, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 07/14] qapi: ensure stable sort ordering when checking QAPI entities, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 10/14] configure: allow use of python 3, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 09/14] scripts: ensure signrom treats data as bytes, Daniel P. Berrange, 2018/01/16
- [Qemu-devel] [PATCH v5 08/14] qapi: force a UTF-8 locale for running Python, Daniel P. Berrange, 2018/01/16