yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 18:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: use items()/values() intead of iteritems()/itervalues()

Browse source 
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.

Backports commit 2f8480447067d6f42af52a886385284ead052af9 from qemu
This commit is contained in:
Daniel P. Berrange 2018-03-06 11:28:20 -05:00 committed by Lioncash
parent 57c29397c1
commit a162292aae
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qemu/scripts/qapi.py
View file

@ -252,7 +252,7 @@ class QAPIDoc(object):
"'Returns:' is only valid for commands") "'Returns:' is only valid for commands")
def check(self): 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 not section.member]
if bogus: if bogus:
raise QAPISemError( raise QAPISemError(
@ -308,7 +308,7 @@ class QAPISchemaParser(object):
if not isinstance(pragma, dict): if not isinstance(pragma, dict):
raise QAPISemError( raise QAPISemError(
info, "Value of 'pragma' must be a dictionary") 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) self._pragma(name, value, info)
else: else:
expr_elem = {'expr': expr, expr_elem = {'expr': expr,
@ -1572,7 +1572,7 @@ class QAPISchema(object):
def _make_members(self, data, info): def _make_members(self, data, info):
return [self._make_member(key, value, 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): def _def_struct_type(self, expr, info, doc):
name = expr['struct'] name = expr['struct']
@ -1604,11 +1604,11 @@ class QAPISchema(object):
name, info, doc, 'base', self._make_members(base, info))) name, info, doc, 'base', self._make_members(base, info)))
if tag_name: if tag_name:
variants = [self._make_variant(key, value) variants = [self._make_variant(key, value)
for (key, value) in data.iteritems()] for (key, value) in data.items()]
members = [] members = []
else: else:
variants = [self._make_simple_variant(key, value, info) 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, typ = self._make_implicit_enum_type(name, info,
[v.name for v in variants]) [v.name for v in variants])
tag_member = QAPISchemaObjectTypeMember('type', typ, False) tag_member = QAPISchemaObjectTypeMember('type', typ, False)
@ -1623,7 +1623,7 @@ class QAPISchema(object):
name = expr['alternate'] name = expr['alternate']
data = expr['data'] data = expr['data']
variants = [self._make_variant(key, value) variants = [self._make_variant(key, value)
for (key, value) in data.iteritems()] for (key, value) in data.items()]
tag_member = QAPISchemaObjectTypeMember('type', 'QType', False) tag_member = QAPISchemaObjectTypeMember('type', 'QType', False)
self._def_entity( self._def_entity(
QAPISchemaAlternateType(name, info, doc, QAPISchemaAlternateType(name, info, doc,