[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/8] qapi: remove _JSONObject
From: |
Markus Armbruster |
Subject: |
[PULL 7/8] qapi: remove _JSONObject |
Date: |
Thu, 23 Feb 2023 13:23:26 +0100 |
From: John Snow <jsnow@redhat.com>
We can remove this alias as it only has two usages now, and no longer
pays for the confusion of "yet another type".
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20230215000011.1725012-6-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/expr.py | 13 +++----------
scripts/qapi/parser.py | 5 ++---
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index b8f905543e..ca01ea6f4a 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -47,14 +47,6 @@
from .source import QAPISourceInfo
-# Deserialized JSON objects as returned by the parser.
-# The values of this mapping are not necessary to exhaustively type
-# here (and also not practical as long as mypy lacks recursive
-# types), because the purpose of this module is to interrogate that
-# type.
-_JSONObject = Dict[str, object]
-
-
# See check_name_str(), below.
valid_name = re.compile(r'(__[a-z0-9.-]+_)?'
r'(x-)?'
@@ -191,7 +183,7 @@ def check_defn_name_str(name: str, info: QAPISourceInfo,
meta: str) -> None:
info, "%s name should not end in 'List'" % meta)
-def check_keys(value: _JSONObject,
+def check_keys(value: Dict[str, object],
info: QAPISourceInfo,
source: str,
required: List[str],
@@ -255,7 +247,8 @@ def check_flags(expr: QAPIExpression) -> None:
expr.info, "flags 'allow-oob' and 'coroutine' are incompatible")
-def check_if(expr: _JSONObject, info: QAPISourceInfo, source: str) -> None:
+def check_if(expr: Dict[str, object],
+ info: QAPISourceInfo, source: str) -> None:
"""
Validate the ``if`` member of an object.
diff --git a/scripts/qapi/parser.py b/scripts/qapi/parser.py
index 50906e27d4..d570086e1a 100644
--- a/scripts/qapi/parser.py
+++ b/scripts/qapi/parser.py
@@ -42,9 +42,8 @@
_ExprValue = Union[List[object], Dict[str, object], str, bool]
-# FIXME: Consolidate and centralize definitions for _ExprValue,
-# JSONValue, and _JSONObject; currently scattered across several
-# modules.
+# FIXME: Consolidate and centralize definitions for _ExprValue and
+# JSONValue; currently scattered across several modules.
class QAPIExpression(Dict[str, object]):
--
2.39.0
- [PULL 0/8] QAPI patches patches for 2023-02-23, Markus Armbruster, 2023/02/23
- [PULL 2/8] docs/devel/qapi-code-gen: Fix a missing 'may', clarify SchemaInfo, Markus Armbruster, 2023/02/23
- [PULL 7/8] qapi: remove _JSONObject,
Markus Armbruster <=
- [PULL 6/8] qapi/parser: add QAPIExpression type, Markus Armbruster, 2023/02/23
- [PULL 1/8] docs/devel/qapi-code-gen: Belatedly update features documentation, Markus Armbruster, 2023/02/23
- [PULL 4/8] qapi: update pylint configuration, Markus Armbruster, 2023/02/23
- [PULL 3/8] qapi: Update flake8 config, Markus Armbruster, 2023/02/23
- [PULL 5/8] qapi: Add minor typing workaround for 3.6, Markus Armbruster, 2023/02/23
- [PULL 8/8] qapi: remove JSON value FIXME, Markus Armbruster, 2023/02/23
- Re: [PULL 0/8] QAPI patches patches for 2023-02-23, Peter Maydell, 2023/02/24