[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[st
From: |
Markus Armbruster |
Subject: |
[PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str] |
Date: |
Fri, 19 Feb 2021 13:04:21 +0100 |
From: John Snow <jsnow@redhat.com>
Optional[List] is clunky; an empty sequence can more elegantly convey
"no variants". By downgrading "List" to "Sequence", we can also accept
tuples; this is useful for the empty tuple specifically, which we may
use as a default parameter because it is immutable.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210216021809.134886-18-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Doc string touched up]
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/introspect.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index e770c9432b..d0b0fd19ed 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -249,13 +249,13 @@ def _use_type(self, typ: QAPISchemaType) -> str:
return self._name(typ.name)
@staticmethod
- def _gen_features(features: List[QAPISchemaFeature]
+ def _gen_features(features: Sequence[QAPISchemaFeature]
) -> List[Annotated[str]]:
return [Annotated(f.name, f.ifcond) for f in features]
def _gen_tree(self, name: str, mtype: str, obj: Dict[str, object],
ifcond: Sequence[str],
- features: Optional[List[QAPISchemaFeature]]) -> None:
+ features: Sequence[QAPISchemaFeature] = ()) -> None:
"""
Build and append a SchemaInfo object to self._trees.
@@ -302,7 +302,7 @@ def _gen_variant(self, variant: QAPISchemaVariant
def visit_builtin_type(self, name: str, info: Optional[QAPISourceInfo],
json_type: str) -> None:
- self._gen_tree(name, 'builtin', {'json-type': json_type}, [], None)
+ self._gen_tree(name, 'builtin', {'json-type': json_type}, [])
def visit_enum_type(self, name: str, info: Optional[QAPISourceInfo],
ifcond: Sequence[str],
@@ -320,7 +320,7 @@ def visit_array_type(self, name: str, info:
Optional[QAPISourceInfo],
element_type: QAPISchemaType) -> None:
element = self._use_type(element_type)
self._gen_tree('[' + element + ']', 'array', {'element-type': element},
- ifcond, None)
+ ifcond)
def visit_object_type_flat(self, name: str, info: Optional[QAPISourceInfo],
ifcond: Sequence[str],
--
2.26.2
- [PATCH 05/18] qapi/introspect.py: guard against ifcond/comment misuse, (continued)
- [PATCH 05/18] qapi/introspect.py: guard against ifcond/comment misuse, Markus Armbruster, 2021/02/19
- [PATCH 11/18] qapi/introspect.py: improve _tree_to_qlit error message, Markus Armbruster, 2021/02/19
- [PATCH 16/18] qapi/introspect.py: Update copyright and authors list, Markus Armbruster, 2021/02/19
- [PATCH 06/18] qapi/introspect.py: Unify return type of _make_tree(), Markus Armbruster, 2021/02/19
- [PATCH 13/18] qapi/introspect.py: remove _gen_variants helper, Markus Armbruster, 2021/02/19
- [PATCH 04/18] qapi/introspect.py: add _gen_features helper, Markus Armbruster, 2021/02/19
- [PATCH 10/18] qapi/introspect.py: create a typed 'Annotated' data strutcure, Markus Armbruster, 2021/02/19
- [PATCH 18/18] qapi/introspect.py: set _gen_tree's default ifcond argument to (), Markus Armbruster, 2021/02/19
- [PATCH 14/18] qapi/introspect.py: add type hint annotations, Markus Armbruster, 2021/02/19
- [PATCH 07/18] qapi/introspect.py: replace 'extra' dict with 'comment' argument, Markus Armbruster, 2021/02/19
- [PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str],
Markus Armbruster <=
- [PATCH 09/18] qapi/introspect.py: Introduce preliminary tree typing, Markus Armbruster, 2021/02/19
- Re: [PATCH 00/18] QAPI patches patches for 2021-02-18, Markus Armbruster, 2021/02/19