diff options
| author | Eric Blake <eblake@redhat.com> | 2015-09-29 16:21:00 -0600 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2015-10-12 18:44:54 +0200 |
| commit | 7408fb67c0f9403f6e40aecf97cf798fc14e2cd8 (patch) | |
| tree | a73da8f810d2e42c7058c65659c41c13fc6ce658 | |
| parent | 1ffe818a395cb883746f3baf8d9a0b6988375e8b (diff) | |
| download | hqemu-7408fb67c0f9403f6e40aecf97cf798fc14e2cd8.zip hqemu-7408fb67c0f9403f6e40aecf97cf798fc14e2cd8.tar.gz | |
qapi: Improve 'include' error message
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>
| -rw-r--r-- | scripts/qapi.py | 3 | ||||
| -rw-r--r-- | tests/qapi-schema/include-non-file.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/include-non-file.json | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index 06478bb..362e007 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -132,8 +132,7 @@ class QAPISchemaParser(object): include = expr["include"] if not isinstance(include, str): raise QAPIExprError(expr_info, - 'Expected a file name (string), got: %s' - % include) + "Value of 'include' must be a string") incl_abs_fname = os.path.join(os.path.dirname(abs_fname), include) # catch inclusion cycle diff --git a/tests/qapi-schema/include-non-file.err b/tests/qapi-schema/include-non-file.err index 9658c78..faae1ea 100644 --- a/tests/qapi-schema/include-non-file.err +++ b/tests/qapi-schema/include-non-file.err @@ -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 diff --git a/tests/qapi-schema/include-non-file.json b/tests/qapi-schema/include-non-file.json index cd43c3f..4711aa4 100644 --- a/tests/qapi-schema/include-non-file.json +++ b/tests/qapi-schema/include-non-file.json @@ -1 +1 @@ -{ 'include': [ 'foo', 'bar' ] } +{ 'include': {} } |
