[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/25] qapi: Assert built-in types exist
From: |
Markus Armbruster |
Subject: |
[PULL 12/25] qapi: Assert built-in types exist |
Date: |
Wed, 24 Apr 2024 10:16:57 +0200 |
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>
Message-ID: <20240315152301.3621858-13-armbru@redhat.com>
Reviewed-by: John Snow <jsnow@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
- [PULL 16/25] qapi/schema: Don't initialize "members" with `None`, (continued)
- [PULL 16/25] qapi/schema: Don't initialize "members" with `None`, Markus Armbruster, 2024/04/24
- [PULL 23/25] qapi/schema: remove unnecessary asserts, Markus Armbruster, 2024/04/24
- [PULL 02/25] qapi/parser: shush up pylint, Markus Armbruster, 2024/04/24
- [PULL 15/25] qapi/schema: add _check_complete flag, Markus Armbruster, 2024/04/24
- [PULL 17/25] qapi/schema: fix typing for QAPISchemaVariants.tag_member, Markus Armbruster, 2024/04/24
- [PULL 03/25] qapi: sort pylint suppressions, Markus Armbruster, 2024/04/24
- [PULL 06/25] qapi/schema: declare type for QAPISchemaObjectTypeMember.type, Markus Armbruster, 2024/04/24
- [PULL 20/25] qapi/parser.py: assert member.info is present in connect_member, Markus Armbruster, 2024/04/24
- [PULL 25/25] qapi: Dumb down QAPISchema.lookup_entity(), Markus Armbruster, 2024/04/24
- [PULL 04/25] qapi/schema: add pylint suppressions, Markus Armbruster, 2024/04/24
- [PULL 12/25] qapi: Assert built-in types exist,
Markus Armbruster <=
- [PULL 07/25] qapi/schema: declare type for QAPISchemaArrayType.element_type, Markus Armbruster, 2024/04/24
- [PULL 05/25] qapi: create QAPISchemaDefinition, Markus Armbruster, 2024/04/24
- [PULL 18/25] qapi/schema: assert inner type of QAPISchemaVariants in check_clash(), Markus Armbruster, 2024/04/24
- [PULL 08/25] qapi/schema: make c_type() and json_type() abstract methods, Markus Armbruster, 2024/04/24
- [PULL 21/25] qapi/schema: add type hints, Markus Armbruster, 2024/04/24
- [PULL 11/25] qapi/schema: assert resolve_type has 'info' and 'what' args on error, Markus Armbruster, 2024/04/24
- [PULL 19/25] qapi/parser: demote QAPIExpression to Dict[str, Any], Markus Armbruster, 2024/04/24
- [PULL 24/25] qapi: Tighten check whether implicit object type already exists, Markus Armbruster, 2024/04/24
- Re: [PULL 00/25] QAPI patches patches for 2024-04-24, Richard Henderson, 2024/04/24