[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 19/25] qapi/parser: demote QAPIExpression to Dict[str, Any]
From: |
Markus Armbruster |
Subject: |
[PATCH v5 19/25] qapi/parser: demote QAPIExpression to Dict[str, Any] |
Date: |
Fri, 15 Mar 2024 16:22:55 +0100 |
From: John Snow <jsnow@redhat.com>
Dict[str, object] is a stricter type, but with the way that code is
currently arranged, it is infeasible to enforce this strictness.
In particular, although expr.py's entire raison d'ĂȘtre is normalization
and type-checking of QAPI Expressions, that type information is not
"remembered" in any meaningful way by mypy because each individual
expression is not downcast to a specific expression type that holds all
the details of each expression's unique form.
As a result, all of the code in schema.py that deals with actually
creating type-safe specialized structures has no guarantee (myopically)
that the data it is being passed is correct.
There are two ways to solve this:
(1) Re-assert that the incoming data is in the shape we expect it to be, or
(2) Disable type checking for this data.
(1) is appealing to my sense of strictness, but I gotta concede that it
is asinine to re-check the shape of a QAPIExpression in schema.py when
expr.py has just completed that work at length. The duplication of code
and the nightmare thought of needing to update both locations if and
when we change the shape of these structures makes me extremely
reluctant to go down this route.
(2) allows us the chance to miss updating types in the case that types
are updated in expr.py, but it *is* an awful lot simpler and,
importantly, gets us closer to type checking schema.py *at
all*. Something is better than nothing, I'd argue.
So, do the simpler dumber thing and worry about future strictness
improvements later.
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/parser.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index ec4ebef4e3..2f3c704fa2 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -19,6 +19,7 @@
import re
from typing import (
TYPE_CHECKING,
+ Any,
Dict,
List,
Mapping,
@@ -43,7 +44,7 @@
_ExprValue = Union[List[object], Dict[str, object], str, bool]
-class QAPIExpression(Dict[str, object]):
+class QAPIExpression(Dict[str, Any]):
# pylint: disable=too-few-public-methods
def __init__(self,
data: Mapping[str, object],
--
2.44.0
- [PATCH v5 13/25] qapi/schema: fix QAPISchemaArrayType.check's call to resolve_type, (continued)
- [PATCH v5 13/25] qapi/schema: fix QAPISchemaArrayType.check's call to resolve_type, Markus Armbruster, 2024/03/15
- [PATCH v5 10/25] qapi/schema: add type narrowing to lookup_type(), Markus Armbruster, 2024/03/15
- [PATCH v5 09/25] qapi/schema: adjust type narrowing for mypy's benefit, Markus Armbruster, 2024/03/15
- [PATCH v5 16/25] qapi/schema: Don't initialize "members" with `None`, Markus Armbruster, 2024/03/15
- [PATCH v5 14/25] qapi/schema: assert info is present when necessary, Markus Armbruster, 2024/03/15
- [PATCH v5 12/25] qapi: Assert built-in types exist, Markus Armbruster, 2024/03/15
- [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 <=
- [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, 2024/03/15
- [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