From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, John Snow <jsnow@redhat.com>
Subject: [PATCH 06/18] qapi/introspect.py: Unify return type of _make_tree()
Date: Fri, 19 Feb 2021 13:04:10 +0100 [thread overview]
Message-ID: <20210219120422.600850-7-armbru@redhat.com> (raw)
In-Reply-To: <20210219120422.600850-1-armbru@redhat.com>
From: John Snow <jsnow@redhat.com>
Returning two different types conditionally can be complicated to
type. Return one type for consistency.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210216021809.134886-7-jsnow@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi/introspect.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py
index a111cec725..7cce0de975 100644
--- a/scripts/qapi/introspect.py
+++ b/scripts/qapi/introspect.py
@@ -29,9 +29,7 @@ def _make_tree(obj, ifcond, extra=None):
extra = {}
if ifcond:
extra['if'] = ifcond
- if extra:
- return (obj, extra)
- return obj
+ return (obj, extra)
def _tree_to_qlit(obj, level=0, dict_value=False):
--
2.26.2
next prev parent reply other threads:[~2021-02-19 12:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-19 12:04 [PATCH 00/18] QAPI patches patches for 2021-02-18 Markus Armbruster
2021-02-19 12:04 ` [PATCH 01/18] qapi: Replace List[str] with Sequence[str] for ifcond Markus Armbruster
2021-02-19 12:04 ` [PATCH 02/18] qapi/introspect.py: assert schema is not None Markus Armbruster
2021-02-19 12:04 ` [PATCH 03/18] qapi/introspect.py: use _make_tree for features nodes Markus Armbruster
2021-02-19 12:04 ` [PATCH 04/18] qapi/introspect.py: add _gen_features helper Markus Armbruster
2021-02-19 12:04 ` [PATCH 05/18] qapi/introspect.py: guard against ifcond/comment misuse Markus Armbruster
2021-02-19 12:04 ` Markus Armbruster [this message]
2021-02-19 12:04 ` [PATCH 07/18] qapi/introspect.py: replace 'extra' dict with 'comment' argument Markus Armbruster
2021-02-19 12:04 ` [PATCH 08/18] qapi/introspect.py: Always define all 'extra' dict keys Markus Armbruster
2021-02-19 12:04 ` [PATCH 09/18] qapi/introspect.py: Introduce preliminary tree typing Markus Armbruster
2021-02-19 12:04 ` [PATCH 10/18] qapi/introspect.py: create a typed 'Annotated' data strutcure Markus Armbruster
2021-02-19 12:04 ` [PATCH 11/18] qapi/introspect.py: improve _tree_to_qlit error message Markus Armbruster
2021-02-19 12:04 ` [PATCH 12/18] qapi/introspect.py: improve readability of _tree_to_qlit Markus Armbruster
2021-02-19 12:04 ` [PATCH 13/18] qapi/introspect.py: remove _gen_variants helper Markus Armbruster
2021-02-19 12:04 ` [PATCH 14/18] qapi/introspect.py: add type hint annotations Markus Armbruster
2021-02-19 12:04 ` [PATCH 15/18] qapi/introspect.py: Add docstrings to _gen_tree and _tree_to_qlit Markus Armbruster
2021-02-19 12:04 ` [PATCH 16/18] qapi/introspect.py: Update copyright and authors list Markus Armbruster
2021-02-19 12:04 ` [PATCH 17/18] qapi/introspect.py: Type _gen_tree variants as Sequence[str] Markus Armbruster
2021-02-19 12:04 ` [PATCH 18/18] qapi/introspect.py: set _gen_tree's default ifcond argument to () Markus Armbruster
2021-02-19 14:49 ` [PATCH 00/18] QAPI patches patches for 2021-02-18 Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210219120422.600850-7-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.