From: Markus Armbruster <armbru@redhat.com>
To: John Snow <jsnow@redhat.com>
Cc: Michael Roth <michael.roth@amd.com>,
qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>,
Cleber Rosa <crosa@redhat.com>
Subject: Re: [PATCH v3 06/16] qapi/expr.py: Check type of 'data' member
Date: Thu, 25 Feb 2021 13:02:18 +0100 [thread overview]
Message-ID: <87k0qws6d1.fsf@dusky.pond.sub.org> (raw)
In-Reply-To: <3da70bbf-bc62-7575-9d70-849384cf6fe6@redhat.com> (John Snow's message of "Wed, 24 Feb 2021 17:06:12 -0500")
John Snow <jsnow@redhat.com> writes:
> On 2/24/21 5:39 AM, Markus Armbruster wrote:
>> John Snow <jsnow@redhat.com> writes:
>>
>>> Iterating over the members of data isn't going to work if it's not some
>>> form of dict anyway, but for the sake of mypy, formalize it.
>>>
>>> Signed-off-by: John Snow <jsnow@redhat.com>
>>> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
>>> ---
>>> scripts/qapi/expr.py | 7 +++++++
>>> 1 file changed, 7 insertions(+)
>>>
>>> diff --git a/scripts/qapi/expr.py b/scripts/qapi/expr.py
>>> index c97e8ce8a4d..afa6bd07769 100644
>>> --- a/scripts/qapi/expr.py
>>> +++ b/scripts/qapi/expr.py
>>> @@ -254,6 +254,9 @@ def check_union(expr, info):
>>> raise QAPISemError(info, "'discriminator' requires 'base'")
>>> check_name_is_str(discriminator, info, "'discriminator'")
>>>
>>> + if not isinstance(members, dict):
>>> + raise QAPISemError(info, "'data' must be an object")
>>> +
>>> for (key, value) in members.items():
>>> source = "'data' member '%s'" % key
>>> check_name_str(key, info, source)
>>> @@ -267,6 +270,10 @@ def check_alternate(expr, info):
>>>
>>> if not members:
>>> raise QAPISemError(info, "'data' must not be empty")
>>> +
>>> + if not isinstance(members, dict):
>>> + raise QAPISemError(info, "'data' must be an object")
>>> +
>>> for (key, value) in members.items():
>>> source = "'data' member '%s'" % key
>>> check_name_str(key, info, source)
>>
>> All errors require a negative test.
>>
>> If an error is unreachable, it should be an assertion instead.
>>
>> If these new errors are reachable, the commit might be a bug fix.
>>
>
> You can, yes:
>
> Traceback (most recent call last):
> File "/home/jsnow/src/qemu/scripts/qapi-gen.py", line 19, in <module>
> sys.exit(main.main())
> File "/home/jsnow/src/qemu/scripts/qapi/main.py", line 89, in main
> generate(args.schema,
> File "/home/jsnow/src/qemu/scripts/qapi/main.py", line 51, in generate
> schema = QAPISchema(schema_file)
> File "/home/jsnow/src/qemu/scripts/qapi/schema.py", line 853, in __init__
> exprs = check_exprs(parser.exprs)
> File "/home/jsnow/src/qemu/scripts/qapi/expr.py", line 337, in
> check_exprs
> check_union(expr, info)
> File "/home/jsnow/src/qemu/scripts/qapi/expr.py", line 248, in
> check_union
> for (key, value) in members.items():
> AttributeError: 'list' object has no attribute 'items'
>
>
> from this beauty:
>
> ##
> # @Foo:
> #
> # @id: identifier of the backend
> #
> # @driver: the backend driver to use
> #
> # @timer-period: timer period (in microseconds, 0: use lowest possible)
> #
> # Since: 4.0
> ##
> { 'union': 'Foo',
> 'base': {
> 'id': 'str',
> 'driver': 'AudiodevDriver',
> '*timer-period': 'uint32' },
> 'discriminator': 'driver',
> 'data': ['hello', 'world']
> }
Definitely a bug fix.
The commit message should say so. It's not just for mypy's sake.
> I'll add some new regression tests for you. Do you want them squished in
> with this commit, or would you like it done kind of independently, at
> the beginning of this series instead?
I prefer the latter, because then bug fix patch nicely illustrates
what's being fixed. Preference, not demand.
next prev parent reply other threads:[~2021-02-25 12:03 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 0:33 [PATCH v3 00/16] qapi: static typing conversion, pt3 John Snow
2021-02-23 0:33 ` [PATCH v3 01/16] qapi/expr.py: Remove 'info' argument from nested check_if_str John Snow
2021-02-23 0:33 ` [PATCH v3 02/16] qapi/expr.py: Check for dict instead of OrderedDict John Snow
2021-02-24 9:30 ` Markus Armbruster
2021-02-24 21:23 ` John Snow
2021-02-25 10:40 ` Markus Armbruster
2021-02-25 20:04 ` John Snow
2021-03-01 16:48 ` Markus Armbruster
2021-02-23 0:33 ` [PATCH v3 03/16] qapi/expr.py: constrain incoming expression types John Snow
2021-02-24 10:01 ` Markus Armbruster
2021-02-24 21:46 ` John Snow
2021-02-25 11:56 ` Markus Armbruster
2021-02-25 20:43 ` John Snow
2021-03-02 5:23 ` Markus Armbruster
2021-02-23 0:33 ` [PATCH v3 04/16] qapi/expr.py: Add assertion for union type 'check_dict' John Snow
2021-02-24 10:35 ` Markus Armbruster
2021-02-24 21:54 ` John Snow
2021-03-24 21:09 ` John Snow
2021-03-25 5:46 ` Markus Armbruster
2021-03-25 19:42 ` John Snow
2021-02-23 0:33 ` [PATCH v3 05/16] qapi/expr.py: move string check upwards in check_type John Snow
2021-02-23 0:33 ` [PATCH v3 06/16] qapi/expr.py: Check type of 'data' member John Snow
2021-02-24 10:39 ` Markus Armbruster
2021-02-24 22:06 ` John Snow
2021-02-25 12:02 ` Markus Armbruster [this message]
2021-02-23 0:33 ` [PATCH v3 07/16] qapi/expr.py: Add casts in a few select cases John Snow
2021-02-24 12:32 ` Markus Armbruster
2021-02-24 22:24 ` John Snow
2021-02-25 12:07 ` Markus Armbruster
2021-02-25 22:10 ` John Snow
2021-02-23 0:34 ` [PATCH v3 08/16] qapi/expr.py: add type hint annotations John Snow
2021-02-24 15:27 ` Markus Armbruster
2021-02-24 22:30 ` John Snow
2021-02-25 12:08 ` Markus Armbruster
2021-02-25 13:56 ` Markus Armbruster
2021-02-25 20:54 ` John Snow
2021-03-02 5:29 ` Markus Armbruster
2021-02-23 0:34 ` [PATCH v3 09/16] qapi/expr.py: Consolidate check_if_str calls in check_if John Snow
2021-02-25 14:23 ` Markus Armbruster
2021-02-25 21:34 ` John Snow
2021-03-02 5:57 ` Markus Armbruster
2021-02-23 0:34 ` [PATCH v3 10/16] qapi/expr.py: Remove single-letter variable John Snow
2021-02-25 14:03 ` Markus Armbruster
2021-02-25 21:56 ` John Snow
2021-02-23 0:34 ` [PATCH v3 11/16] qapi/expr.py: enable pylint checks John Snow
2021-02-23 0:34 ` [PATCH v3 12/16] qapi/expr.py: Add docstrings John Snow
2021-02-23 0:34 ` [PATCH v3 13/16] qapi/expr.py: Modify check_keys to accept any Collection John Snow
2021-02-25 15:41 ` Markus Armbruster
2021-02-23 0:34 ` [PATCH v3 14/16] qapi/expr.py: Use tuples instead of lists for static data John Snow
2021-02-23 0:34 ` [PATCH v3 15/16] qapi/expr.py: move related checks inside check_xxx functions John Snow
2021-02-25 15:28 ` Markus Armbruster
2021-03-25 5:17 ` John Snow
2021-03-25 13:28 ` Markus Armbruster
2021-02-23 0:34 ` [PATCH v3 16/16] qapi/expr.py: Use an expression checker dispatch table 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=87k0qws6d1.fsf@dusky.pond.sub.org \
--to=armbru@redhat.com \
--cc=crosa@redhat.com \
--cc=ehabkost@redhat.com \
--cc=jsnow@redhat.com \
--cc=michael.roth@amd.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).