[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 11/25] qapi/schema: assert resolve_type has 'info' and 'what'
From: |
Markus Armbruster |
Subject: |
[PATCH v5 11/25] qapi/schema: assert resolve_type has 'info' and 'what' args on error |
Date: |
Fri, 15 Mar 2024 16:22:47 +0100 |
From: John Snow <jsnow@redhat.com>
resolve_type() is generally used to resolve configuration-provided type
names into type objects, and generally requires valid 'info' and 'what'
parameters.
In some cases, such as with QAPISchemaArrayType.check(), resolve_type
may be used to resolve built-in types and as such will not have an
'info' argument, but also must not fail in this scenario.
Use an assertion to sate mypy that we will indeed have 'info' and 'what'
parameters for the error pathway in resolve_type.
Note: there are only three callsites to resolve_type at present where
"info" is perceived by mypy to be possibly None:
1) QAPISchemaArrayType.check()
2) QAPISchemaObjectTypeMember.check()
3) QAPISchemaEvent.check()
Of those three, only the first actually ever passes None; the other two
are limited by their base class initializers which accept info=None, but
neither subclass actually use a None value in practice, currently.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/schema.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 1034825415..0ef9b3398a 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -996,6 +996,7 @@ def lookup_type(self, name):
def resolve_type(self, name, info, what):
typ = self.lookup_type(name)
if not typ:
+ assert info and what # built-in types must not fail lookup
if callable(what):
what = what(info)
raise QAPISemError(
--
2.44.0
- Re: [PATCH v5 12/25] qapi: Assert built-in types exist, (continued)
- [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
- [PATCH v5 11/25] qapi/schema: assert resolve_type has 'info' and 'what' args on error,
Markus Armbruster <=
- [PATCH v5 18/25] qapi/schema: assert inner type of QAPISchemaVariants in check_clash(), Markus Armbruster, 2024/03/15
- [PATCH v5 21/25] qapi/schema: add type hints, Markus Armbruster, 2024/03/15
- [PATCH v5 23/25] qapi/schema: remove unnecessary asserts, Markus Armbruster, 2024/03/15
- [PATCH v5 05/25] qapi: create QAPISchemaDefinition, Markus Armbruster, 2024/03/15
- [PATCH v5 01/25] qapi/parser: fix typo - self.returns.info => self.errors.info, Markus Armbruster, 2024/03/15
- [PATCH v5 07/25] qapi/schema: declare type for QAPISchemaArrayType.element_type, Markus Armbruster, 2024/03/15
- [PATCH v5 02/25] qapi/parser: shush up pylint, Markus Armbruster, 2024/03/15
- [PATCH v5 24/25] qapi: Tighten check whether implicit object type already exists, Markus Armbruster, 2024/03/15