[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 12/25] qapi: Assert built-in types exist
From: |
Markus Armbruster |
Subject: |
[PATCH v5 12/25] qapi: Assert built-in types exist |
Date: |
Fri, 15 Mar 2024 16:22:48 +0100 |
QAPISchema.lookup_type('FOO') returns a QAPISchemaType when type 'FOO'
exists, else None. It won't return None for built-in types like
'int'.
Since mypy can't see that, it'll complain that we assign the
Optional[QAPISchemaType] returned by .lookup_type() to QAPISchemaType
variables.
Add assertions to help it over the hump.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/introspect.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index 67c7d89aae..4679b1bc2c 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -227,10 +227,14 @@ def _use_type(self, typ: QAPISchemaType) -> str:
# Map the various integer types to plain int
if typ.json_type() == 'int':
- typ = self._schema.lookup_type('int')
+ type_int = self._schema.lookup_type('int')
+ assert type_int
+ typ = type_int
elif (isinstance(typ, QAPISchemaArrayType) and
typ.element_type.json_type() == 'int'):
- typ = self._schema.lookup_type('intList')
+ type_intList = self._schema.lookup_type('intList')
+ assert type_intList
+ typ = type_intList
# Add type to work queue if new
if typ not in self._used_types:
self._used_types.append(typ)
--
2.44.0
- [PATCH v5 00/25] qapi: statically type schema.py, Markus Armbruster, 2024/03/15
- [PATCH v5 04/25] qapi/schema: add pylint suppressions, Markus Armbruster, 2024/03/15
- [PATCH v5 06/25] qapi/schema: declare type for QAPISchemaObjectTypeMember.type, Markus Armbruster, 2024/03/15
- [PATCH v5 03/25] qapi: sort pylint suppressions, Markus Armbruster, 2024/03/15
- [PATCH v5 13/25] qapi/schema: fix QAPISchemaArrayType.check's call to resolve_type, Markus Armbruster, 2024/03/15
- [PATCH v5 10/25] qapi/schema: add type narrowing to lookup_type(), Markus Armbruster, 2024/03/15
- [PATCH v5 09/25] qapi/schema: adjust type narrowing for mypy's benefit, Markus Armbruster, 2024/03/15
- [PATCH v5 16/25] qapi/schema: Don't initialize "members" with `None`, Markus Armbruster, 2024/03/15
- [PATCH v5 14/25] qapi/schema: assert info is present when necessary, Markus Armbruster, 2024/03/15
- [PATCH v5 12/25] qapi: Assert built-in types exist,
Markus Armbruster <=
- [PATCH v5 20/25] qapi/parser.py: assert member.info is present in connect_member, Markus Armbruster, 2024/03/15
- [PATCH v5 22/25] qapi/schema: turn on mypy strictness, Markus Armbruster, 2024/03/15
- [PATCH v5 15/25] qapi/schema: add _check_complete flag, Markus Armbruster, 2024/03/15
- [PATCH v5 19/25] qapi/parser: demote QAPIExpression to Dict[str, Any], Markus Armbruster, 2024/03/15
- [PATCH v5 08/25] qapi/schema: make c_type() and json_type() abstract methods, Markus Armbruster, 2024/03/15
- [PATCH v5 17/25] qapi/schema: fix typing for QAPISchemaVariants.tag_member, Markus Armbruster, 2024/03/15
- [PATCH v5 25/25] qapi: Dumb down QAPISchema.lookup_entity(), Markus Armbruster, 2024/03/15