[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/23] qapi/schema: assert resolve_type has 'info' and 'what'
From: |
John Snow |
Subject: |
[PATCH v4 11/23] qapi/schema: assert resolve_type has 'info' and 'what' args on error |
Date: |
Wed, 13 Mar 2024 00:41:15 -0400 |
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>
---
scripts/qapi/schema.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index b157a3b2bd8..f5c7789d98f 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 v4 05/23] qapi: create QAPISchemaDefinition, (continued)
[PATCH v4 22/23] qapi/schema: turn on mypy strictness, John Snow, 2024/03/13
[PATCH v4 19/23] qapi/parser: demote QAPIExpression to Dict[str, Any], John Snow, 2024/03/13
[PATCH v4 15/23] qapi/schema: add _check_complete flag, John Snow, 2024/03/13
[PATCH v4 11/23] qapi/schema: assert resolve_type has 'info' and 'what' args on error,
John Snow <=
[PATCH v4 20/23] qapi/parser.py: assert member.info is present in connect_member, John Snow, 2024/03/13
[PATCH v4 21/23] qapi/schema: add type hints, John Snow, 2024/03/13
[PATCH v4 08/23] qapi/schema: make c_type() and json_type() abstract methods, John Snow, 2024/03/13
[PATCH v4 06/23] qapi/schema: declare type for QAPISchemaObjectTypeMember.type, John Snow, 2024/03/13
[PATCH v4 10/23] qapi/schema: add type narrowing to lookup_type(), John Snow, 2024/03/13
[PATCH v4 23/23] qapi/schema: remove unnecessary asserts, John Snow, 2024/03/13
Re: [PATCH v4 00/23] qapi: statically type schema.py, Markus Armbruster, 2024/03/14