OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: remove _JSONObject

Browse Source 
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>
This commit is contained in:
John Snow 2023-02-14 19:00:10 -05:00 committed by Markus Armbruster
parent 420110591c
commit 67a81f9fb7
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/qapi/expr.py
View File

@ -47,14 +47,6 @@ from .parser import QAPIExpression
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.

5
scripts/qapi/parser.py
View File

@ -42,9 +42,8 @@ if TYPE_CHECKING:
_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]):