diff options
| author | Eric Blake | 2015-05-04 17:05:02 +0200 |
|---|---|---|
| committer | Markus Armbruster | 2015-05-05 18:39:00 +0200 |
| commit | fe2a9303c9e511462f662a415c2e9d2defe9b7ca (patch) | |
| tree | 9fd7bef56fe096410f20aae809a59e3fd3b66f43 | |
| parent | qapi: Fix generation of 'size' builtin type (diff) | |
| download | qemu-fe2a9303c9e511462f662a415c2e9d2defe9b7ca.tar.gz qemu-fe2a9303c9e511462f662a415c2e9d2defe9b7ca.tar.xz qemu-fe2a9303c9e511462f662a415c2e9d2defe9b7ca.zip | |
qapi: Require ASCII in schema
Python 2 and Python 3 have a wild history of whether strings
default to ascii or unicode, where Python 3 requires checking
isinstance(foo, basestr) to cover all strings, but where that
code is not portable to Python 2. It's simpler to just state
that we don't care about Unicode strings, and to just always
use the simpler isinstance(foo, str) everywhere.
I'm no python expert, so I'm basing it on this conversation:
https://lists.gnu.org/archive/html/qemu-devel/2014-09/msg05278.html
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rw-r--r-- | scripts/qapi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qapi.py b/scripts/qapi.py index d47034760d..20ee505430 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -2,7 +2,7 @@ # QAPI helper library # # Copyright IBM, Corp. 2011 -# Copyright (c) 2013 Red Hat Inc. +# Copyright (c) 2013-2015 Red Hat Inc. # # Authors: # Anthony Liguori <aliguori@us.ibm.com> @@ -354,7 +354,7 @@ def parse_schema(input_file): return exprs def parse_args(typeinfo): - if isinstance(typeinfo, basestring): + if isinstance(typeinfo, str): struct = find_struct(typeinfo) assert struct != None typeinfo = struct['data'] |