From: John Snow <jsnow@redhat.com>
To: Markus Armbruster <armbru@redhat.com>, qemu-devel@nongnu.org
Cc: John Snow <jsnow@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Cleber Rosa <crosa@redhat.com>
Subject: [PATCH v5 05/15] qapi/introspect.py: Unify return type of _make_tree()
Date: Wed, 3 Feb 2021 19:31:57 -0500 [thread overview]
Message-ID: <20210204003207.2856909-6-jsnow@redhat.com> (raw)
In-Reply-To: <20210204003207.2856909-1-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>
---
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 a7ccda5ab92..7730d8ed6b2 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.29.2
next prev parent reply other threads:[~2021-02-04 0:42 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-04 0:31 [PATCH v5 00/15] qapi: static typing conversion, pt2 John Snow
2021-02-04 0:31 ` [PATCH v5 01/15] qapi/introspect.py: assert schema is not None John Snow
2021-02-04 0:31 ` [PATCH v5 02/15] qapi/introspect.py: use _make_tree for features nodes John Snow
2021-02-04 0:31 ` [PATCH v5 03/15] qapi/introspect.py: add _gen_features helper John Snow
2021-02-04 0:31 ` [PATCH v5 04/15] qapi/introspect.py: guard against ifcond/comment misuse John Snow
2021-02-04 0:31 ` John Snow [this message]
2021-02-04 0:31 ` [PATCH v5 06/15] qapi/introspect.py: replace 'extra' dict with 'comment' argument John Snow
2021-02-04 0:31 ` [PATCH v5 07/15] qapi/introspect.py: Always define all 'extra' dict keys John Snow
2021-02-04 0:32 ` [PATCH v5 08/15] qapi/introspect.py: Introduce preliminary tree typing John Snow
2021-02-08 14:29 ` Markus Armbruster
2021-02-04 0:32 ` [PATCH v5 09/15] qapi/introspect.py: create a typed 'Annotated' data strutcure John Snow
2021-02-08 14:36 ` Markus Armbruster
2021-02-08 20:53 ` John Snow
2021-02-04 0:32 ` [PATCH v5 10/15] qapi/introspect.py: improve _tree_to_qlit error message John Snow
2021-02-04 0:32 ` [PATCH v5 11/15] qapi/introspect.py: improve readability of _tree_to_qlit John Snow
2021-02-04 0:32 ` [PATCH v5 12/15] qapi/introspect.py: add type hint annotations John Snow
2021-02-08 15:34 ` Markus Armbruster
2021-02-08 20:45 ` John Snow
2021-02-09 9:17 ` Markus Armbruster
2021-02-10 17:05 ` John Snow
2021-02-04 0:32 ` [PATCH v5 13/15] qapi/introspect.py: add introspect.json dummy types John Snow
2021-02-08 15:43 ` Markus Armbruster
2021-02-08 15:56 ` John Snow
2021-02-04 0:32 ` [PATCH v5 14/15] qapi/introspect.py: Add docstring to _tree_to_qlit John Snow
2021-02-08 15:45 ` Markus Armbruster
2021-02-08 15:57 ` John Snow
2021-02-04 0:32 ` [PATCH v5 15/15] qapi/introspect.py: Update copyright and authors list John Snow
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=20210204003207.2856909-6-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).