From: John Snow Date: Fri, 15 Mar 2024 15:22:50 +0000 (+0100) Subject: qapi/schema: assert info is present when necessary X-Git-Tag: v9.1.0-rc0~140^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b9e7fd3b38d4e0fb9311752a5b44b71cd8fbbc1;p=thirdparty%2Fqemu.git qapi/schema: assert info is present when necessary QAPISchemaInfo arguments can often be None because built-in definitions don't have such information. The type hint can only be Optional[QAPISchemaInfo] then. But, mypy gets upset about all the places where we exploit that it can't actually be None there. Add assertions that will help mypy over the hump, to enable adding type hints in a forthcoming commit. Signed-off-by: John Snow Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster Message-ID: <20240315152301.3621858-15-armbru@redhat.com> --- diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 087c6e93661..173e27d9e21 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -751,6 +751,7 @@ class QAPISchemaMember: else: assert False + assert info is not None if defined_in != info.defn_name: return "%s '%s' of %s '%s'" % (role, self.name, meta, defined_in) return "%s '%s'" % (role, self.name) @@ -841,6 +842,7 @@ class QAPISchemaCommand(QAPISchemaDefinition): self.coroutine = coroutine def check(self, schema): + assert self.info is not None super().check(schema) if self._arg_type_name: arg_type = schema.resolve_type(