aboutsummaryrefslogtreecommitdiff
path: root/scripts/qapi
diff options
context:
space:
mode:
authorJohn Snow <jsnow@redhat.com>2020-10-09 12:15:55 -0400
committerMarkus Armbruster <armbru@redhat.com>2020-10-10 11:37:49 +0200
commitdec44d3d659446c333c52e0c95c996b6881f94d6 (patch)
tree6ed06eaf1ea56339812e633a914e308d15eda836 /scripts/qapi
parentcd073c8fb0e86f135dbc573c2651863867183a75 (diff)
downloadqemu-dec44d3d659446c333c52e0c95c996b6881f94d6.zip
qemu-dec44d3d659446c333c52e0c95c996b6881f94d6.tar.gz
qemu-dec44d3d659446c333c52e0c95c996b6881f94d6.tar.bz2
qapi/types.py: remove one-letter variables
"John, if pylint told you to jump off a bridge, would you?" Hey, if it looked like fun, I might. Now that this file is clean, enable pylint checks on this file. Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Cleber Rosa <crosa@redhat.com> Message-Id: <20201009161558.107041-34-jsnow@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'scripts/qapi')
-rw-r--r--scripts/qapi/pylintrc1
-rw-r--r--scripts/qapi/types.py29
2 files changed, 15 insertions, 15 deletions
diff --git a/scripts/qapi/pylintrc b/scripts/qapi/pylintrc
index 8badcb1..b3c4cf4 100644
--- a/scripts/qapi/pylintrc
+++ b/scripts/qapi/pylintrc
@@ -6,7 +6,6 @@ ignore-patterns=error.py,
expr.py,
parser.py,
schema.py,
- types.py,
visit.py,
diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py
index 766822f..2b4916c 100644
--- a/scripts/qapi/types.py
+++ b/scripts/qapi/types.py
@@ -49,14 +49,14 @@ const QEnumLookup %(c_name)s_lookup = {
.array = (const char *const[]) {
''',
c_name=c_name(name))
- for m in members:
- ret += gen_if(m.ifcond)
- index = c_enum_const(name, m.name, prefix)
+ for memb in members:
+ ret += gen_if(memb.ifcond)
+ index = c_enum_const(name, memb.name, prefix)
ret += mcgen('''
[%(index)s] = "%(name)s",
''',
- index=index, name=m.name)
- ret += gen_endif(m.ifcond)
+ index=index, name=memb.name)
+ ret += gen_endif(memb.ifcond)
ret += mcgen('''
},
@@ -79,13 +79,13 @@ typedef enum %(c_name)s {
''',
c_name=c_name(name))
- for m in enum_members:
- ret += gen_if(m.ifcond)
+ for memb in enum_members:
+ ret += gen_if(memb.ifcond)
ret += mcgen('''
%(c_enum)s,
''',
- c_enum=c_enum_const(name, m.name, prefix))
- ret += gen_endif(m.ifcond)
+ c_enum=c_enum_const(name, memb.name, prefix))
+ ret += gen_endif(memb.ifcond)
ret += mcgen('''
} %(c_name)s;
@@ -148,11 +148,12 @@ def gen_object(name: str, ifcond: List[str],
objects_seen.add(name)
ret = ''
- if variants:
- for v in variants.variants:
- if isinstance(v.type, QAPISchemaObjectType):
- ret += gen_object(v.type.name, v.type.ifcond, v.type.base,
- v.type.local_members, v.type.variants)
+ for var in variants.variants if variants else ():
+ obj = var.type
+ if not isinstance(obj, QAPISchemaObjectType):
+ continue
+ ret += gen_object(obj.name, obj.ifcond, obj.base,
+ obj.local_members, obj.variants)
ret += mcgen('''