[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/18] qapi/introspect.py: Always define all 'extra' dict keys
From: |
Markus Armbruster |
Subject: |
[PULL 08/18] qapi/introspect.py: Always define all 'extra' dict keys |
Date: |
Fri, 19 Feb 2021 15:49:29 +0100 |
From: John Snow <jsnow@redhat.com>
This mimics how a typed object works, where 'if' and 'comment' are
always set, regardless of if they have a value set or not.
It is safe to do this because of the way that _tree_to_qlit processes
these values (using dict.get with a default of None), resulting in no
change of output from _tree_to_qlit. There are no other users of this
data.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210216021809.134886-9-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/introspect.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index c4326d42cb..88af5383d5 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -27,11 +27,10 @@ from .schema import (
def _make_tree(obj, ifcond, comment=None):
- extra = {}
- if ifcond:
- extra['if'] = ifcond
- if comment:
- extra['comment'] = comment
+ extra = {
+ 'if': ifcond,
+ 'comment': comment
+ }
return (obj, extra)
--
2.26.2
- [PULL 00/18] QAPI patches patches for 2021-02-18, Markus Armbruster, 2021/02/19
- [PULL 02/18] qapi/introspect.py: assert schema is not None, Markus Armbruster, 2021/02/19
- [PULL 11/18] qapi/introspect.py: improve _tree_to_qlit error message, Markus Armbruster, 2021/02/19
- [PULL 15/18] qapi/introspect.py: Add docstrings to _gen_tree and _tree_to_qlit, Markus Armbruster, 2021/02/19
- [PULL 12/18] qapi/introspect.py: improve readability of _tree_to_qlit, Markus Armbruster, 2021/02/19
- [PULL 05/18] qapi/introspect.py: guard against ifcond/comment misuse, Markus Armbruster, 2021/02/19
- [PULL 18/18] qapi/introspect.py: set _gen_tree's default ifcond argument to (), Markus Armbruster, 2021/02/19
- [PULL 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str], Markus Armbruster, 2021/02/19
- [PULL 01/18] qapi: Replace List[str] with Sequence[str] for ifcond, Markus Armbruster, 2021/02/19
- [PULL 13/18] qapi/introspect.py: remove _gen_variants helper, Markus Armbruster, 2021/02/19
- [PULL 08/18] qapi/introspect.py: Always define all 'extra' dict keys,
Markus Armbruster <=
- [PULL 07/18] qapi/introspect.py: replace 'extra' dict with 'comment' argument, Markus Armbruster, 2021/02/19
- [PULL 06/18] qapi/introspect.py: Unify return type of _make_tree(), Markus Armbruster, 2021/02/19
- [PULL 09/18] qapi/introspect.py: Introduce preliminary tree typing, Markus Armbruster, 2021/02/19
- [PULL 10/18] qapi/introspect.py: create a typed 'Annotated' data strutcure, Markus Armbruster, 2021/02/19
- [PULL 14/18] qapi/introspect.py: add type hint annotations, Markus Armbruster, 2021/02/19
- [PULL 16/18] qapi/introspect.py: Update copyright and authors list, Markus Armbruster, 2021/02/19
- [PULL 04/18] qapi/introspect.py: add _gen_features helper, Markus Armbruster, 2021/02/19
- [PULL 03/18] qapi/introspect.py: use _make_tree for features nodes, Markus Armbruster, 2021/02/19
- Re: [PULL 00/18] QAPI patches patches for 2021-02-18, Peter Maydell, 2021/02/19