[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/25] qapi/schema: fix QAPISchemaArrayType.check's call to resolv
From: |
Markus Armbruster |
Subject: |
[PULL 13/25] qapi/schema: fix QAPISchemaArrayType.check's call to resolve_type |
Date: |
Wed, 24 Apr 2024 10:16:58 +0200 |
From: John Snow <jsnow@redhat.com>
Adjust the expression at the callsite to work around mypy's weak type
introspection that believes this expression can resolve to
QAPISourceInfo; it cannot.
(Fundamentally: self.info only resolves to false in a boolean expression
when it is None; therefore this expression may only ever produce
Optional[str]. mypy does not know that 'info', when it is a
QAPISourceInfo object, cannot ever be false.)
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240315152301.3621858-14-armbru@redhat.com>
---
scripts/qapi/schema.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 0ef9b3398a..087c6e9366 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -395,7 +395,7 @@ def check(self, schema):
super().check(schema)
self.element_type = schema.resolve_type(
self._element_type_name, self.info,
- self.info and self.info.defn_meta)
+ self.info.defn_meta if self.info else None)
assert not isinstance(self.element_type, QAPISchemaArrayType)
def set_module(self, schema):
--
2.44.0
- [PULL 00/25] QAPI patches patches for 2024-04-24, Markus Armbruster, 2024/04/24
- [PULL 01/25] qapi/parser: fix typo - self.returns.info => self.errors.info, Markus Armbruster, 2024/04/24
- [PULL 09/25] qapi/schema: adjust type narrowing for mypy's benefit, Markus Armbruster, 2024/04/24
- [PULL 14/25] qapi/schema: assert info is present when necessary, Markus Armbruster, 2024/04/24
- [PULL 22/25] qapi/schema: turn on mypy strictness, Markus Armbruster, 2024/04/24
- [PULL 13/25] qapi/schema: fix QAPISchemaArrayType.check's call to resolve_type,
Markus Armbruster <=
- [PULL 10/25] qapi/schema: add type narrowing to lookup_type(), Markus Armbruster, 2024/04/24
- [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