mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Improve 'include' error message

Browse Source 
Use of '"...%s" % include' to print non-strings can lead to
ugly messages, such as this (if the .json change is applied
without the qapi.py change):
 Expected a file name (string), got: OrderedDict()

Better is to just omit the actual non-string value in the
message.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1443565276-4535-3-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-09-29 16:21:00 -06:00 committed by Markus Armbruster
parent 1ffe818a39
commit 7408fb67c0
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/qapi.py
View File

@ -132,8 +132,7 @@ class QAPISchemaParser(object):
include = expr["include"] include = expr["include"]
if not isinstance(include, str): if not isinstance(include, str):
raise QAPIExprError(expr_info, raise QAPIExprError(expr_info,
'Expected a file name (string), got: %s' "Value of 'include' must be a string")
% include)
incl_abs_fname = os.path.join(os.path.dirname(abs_fname), incl_abs_fname = os.path.join(os.path.dirname(abs_fname),
include) include)
# catch inclusion cycle # catch inclusion cycle

2
tests/qapi-schema/include-non-file.err
View File

@ -1 +1 @@
tests/qapi-schema/include-non-file.json:1: Expected a file name (string), got: ['foo', 'bar'] tests/qapi-schema/include-non-file.json:1: Value of 'include' must be a string

2
tests/qapi-schema/include-non-file.json
View File

@ -1 +1 @@
{ 'include': [ 'foo', 'bar' ] } { 'include': {} }