From: John Snow <jsnow@redhat.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: Cleber Rosa <crosa@redhat.com>, John Snow <jsnow@redhat.com>,
qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>,
Michael Roth <mdroth@linux.vnet.ibm.com>
Subject: [PATCH 13/16] qapi/expr.py: Modify check_keys to accept any Iterable
Date: Tue, 22 Sep 2020 17:13:10 -0400 [thread overview]
Message-ID: <20200922211313.4082880-14-jsnow@redhat.com> (raw)
In-Reply-To: <20200922211313.4082880-1-jsnow@redhat.com>
This is a very minor adjustment.
a + b is list-specific behavior, but we can accept a wider variety of
types in a more pythonic fashion if we avoid that behavior.
Typing it this way allows callers to use things like dict.keys() and
other iterables that are not their own discrete lists.
Including it just as a statement of practice if nothing else: It's nice
to use the least-specific type possible as function input and use the
most-specific type for returns.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qapi/expr.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
index 4bba09f6e5..2a1f37ca88 100644
--- a/scripts/qapi/expr.py
+++ b/scripts/qapi/expr.py
@@ -132,8 +132,8 @@ def check_defn_name_str(name: str, info: QAPISourceInfo, meta: str) -> None:
def check_keys(value: _JSObject,
info: QAPISourceInfo,
source: str,
- required: List[str],
- optional: List[str]) -> None:
+ required: Iterable[str] = (),
+ optional: Iterable[str] = ()) -> None:
"""
Ensures an object has a specific set of keys. [Const]
@@ -154,7 +154,7 @@ def pprint(elems: Iterable[str]) -> str:
"%s misses key%s %s"
% (source, 's' if len(missing) > 1 else '',
pprint(missing)))
- allowed = set(required + optional)
+ allowed = set(required) | set(optional)
unknown = set(value) - allowed
if unknown:
raise QAPISemError(
--
2.26.2
next prev parent reply other threads:[~2020-09-22 21:44 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 21:12 [PATCH 00/16] qapi: static typing conversion, pt2 John Snow
2020-09-22 21:12 ` [PATCH 01/16] qapi/expr.py: Remove 'info' argument from nested check_if_str John Snow
2020-09-23 19:26 ` Eduardo Habkost
2020-09-24 23:06 ` Cleber Rosa
2020-09-22 21:12 ` [PATCH 02/16] qapi/expr.py: Check for dict instead of OrderedDict John Snow
2020-09-23 19:26 ` Eduardo Habkost
2020-09-24 23:07 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 03/16] qapi/expr.py: constrain incoming expression types John Snow
2020-09-23 19:42 ` Eduardo Habkost
2020-09-25 0:05 ` Cleber Rosa
2020-09-25 0:43 ` John Snow
2020-09-25 0:40 ` John Snow
2020-09-25 0:06 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 04/16] qapi/expr.py: Add assertion for union type 'check_dict' John Snow
2020-09-23 19:53 ` Eduardo Habkost
2020-09-25 0:47 ` John Snow
2020-09-25 1:08 ` Eduardo Habkost
2020-09-25 1:30 ` John Snow
2020-09-25 0:19 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 05/16] qapi/expr.py: move string check upwards in check_type John Snow
2020-09-23 19:56 ` Eduardo Habkost
2020-09-25 0:22 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 06/16] qapi/expr.py: Check type of 'data' member John Snow
2020-09-23 19:58 ` Eduardo Habkost
2020-09-25 0:31 ` Cleber Rosa
2020-09-25 0:50 ` John Snow
2020-09-25 16:48 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 07/16] qapi/expr.py: Add casts in a few select cases John Snow
2020-09-23 20:01 ` Eduardo Habkost
2020-09-25 0:36 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 08/16] qapi/expr.py: add type hint annotations John Snow
2020-09-23 20:06 ` Eduardo Habkost
2020-09-25 0:44 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 09/16] qapi/expr.py: rewrite check_if John Snow
2020-09-23 20:09 ` Eduardo Habkost
2020-09-25 0:50 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 10/16] qapi/expr.py: Remove single-letter variable John Snow
2020-09-23 20:11 ` Eduardo Habkost
2020-09-25 0:52 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 11/16] qapi/expr.py: enable pylint checks John Snow
2020-09-23 20:12 ` Eduardo Habkost
2020-09-25 0:53 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 12/16] qapi/expr.py: Add docstrings John Snow
2020-09-23 20:16 ` Eduardo Habkost
2020-09-25 0:52 ` John Snow
2020-09-25 0:59 ` Cleber Rosa
2020-09-25 1:10 ` John Snow
2020-09-22 21:13 ` John Snow [this message]
2020-09-23 20:17 ` [PATCH 13/16] qapi/expr.py: Modify check_keys to accept any Iterable Eduardo Habkost
2020-09-25 1:02 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 14/16] qapi/expr.py: Use tuples instead of lists for static data John Snow
2020-09-23 20:18 ` Eduardo Habkost
2020-09-25 1:03 ` Cleber Rosa
2020-09-25 1:12 ` John Snow
2020-09-22 21:13 ` [PATCH 15/16] qapi/expr.py: move related checks inside check_xxx functions John Snow
2020-09-23 20:25 ` Eduardo Habkost
2020-09-25 0:58 ` John Snow
2020-09-25 1:09 ` Cleber Rosa
2020-09-22 21:13 ` [PATCH 16/16] qapi/expr.py: Use an expression checker dispatch table John Snow
2020-09-23 20:36 ` Eduardo Habkost
2020-09-25 0:59 ` John Snow
2020-09-25 1:18 ` Cleber Rosa
2020-09-25 1:32 ` John Snow
2020-09-25 6:03 ` Helio Loureiro
2020-09-25 14:16 ` John Snow
2020-09-26 11:31 ` Helio Loureiro
2020-09-30 4:46 ` John Snow
2020-09-25 16:38 ` Cleber Rosa
2020-09-25 17:04 ` John Snow
2020-09-25 22:54 ` [PATCH 00/16] qapi: static typing conversion, pt2 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=20200922211313.4082880-14-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mdroth@linux.vnet.ibm.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 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.