From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, berto@igalia.com, armbru@redhat.com
Subject: [Qemu-devel] [PATCH v7 05/39] qapi: Require ASCII in schema
Date: Wed, 29 Apr 2015 07:06:20 -0600 [thread overview]
Message-ID: <1430312814-19706-6-git-send-email-eblake@redhat.com> (raw)
In-Reply-To: <1430312814-19706-1-git-send-email-eblake@redhat.com>
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>
---
scripts/qapi.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi.py b/scripts/qapi.py
index d470347..20ee505 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']
--
2.1.0
next prev parent reply other threads:[~2015-04-29 13:07 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-29 13:06 [Qemu-devel] [PATCH v7 00/39] drop qapi nested structs Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 01/39] qapi: Add copyright declaration on docs Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 02/39] qapi: Document type-safety considerations Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 03/39] qapi: Simplify builtin type handling Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 04/39] qapi: Fix generation of 'size' builtin type Eric Blake
2015-04-29 13:06 ` Eric Blake [this message]
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 06/39] qapi: Add some enum tests Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 07/39] qapi: Better error messages for bad enums Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 08/39] qapi: Add some union tests Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 09/39] qapi: Clean up test coverage of simple unions Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 10/39] qapi: Forbid base without discriminator in unions Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 11/39] qapi: Tighten checking of unions Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 12/39] qapi: Prepare for catching more semantic parse errors Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 13/39] qapi: Segregate anonymous unions into alternates in generator Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 14/39] qapi: Rename anonymous union type in test Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 15/39] qapi: Document new 'alternate' meta-type Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 16/39] qapi: Use 'alternate' to replace anonymous union Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 17/39] qapi: Add some expr tests Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 18/39] qapi: Better error messages for bad expressions Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 19/39] qapi: Add tests of redefined expressions Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 20/39] qapi: Better error messages for duplicated expressions Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 21/39] qapi: Allow true, false and null in schema json Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 22/39] qapi: Unify type bypass and add tests Eric Blake
2015-05-01 19:55 ` Eric Blake
2015-05-01 20:10 ` [Qemu-devel] [PATCHv7 22a/39] squash: " Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 23/39] qapi: Add some type check tests Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 24/39] qapi: More rigourous checking of types Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 25/39] qapi: Require valid names Eric Blake
2015-05-02 20:51 ` Eric Blake
2015-05-04 7:26 ` Markus Armbruster
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 26/39] qapi: Whitelist commands that don't return dictionary Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 27/39] qapi: More rigorous checking for type safety bypass Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 28/39] qapi: Prefer 'struct' over 'type' in generator Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 29/39] qapi: Document 'struct' metatype Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 30/39] qapi: Use 'struct' instead of 'type' in schema Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 31/39] qapi: Forbid " Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 32/39] qapi: Merge UserDefTwo and UserDefNested in tests Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 33/39] qapi: Drop tests for inline nested structs Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 34/39] qapi: Drop inline nested struct in query-version Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 35/39] qapi: Drop inline nested structs in query-pci Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 36/39] qapi: Drop support for inline nested types Eric Blake
2015-05-01 20:20 ` Eric Blake
2015-05-04 7:28 ` Markus Armbruster
2015-05-01 20:29 ` [Qemu-devel] [PATCH v7 36a/39] squash: qapi: Drop dead visitor code related to nested structs Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 37/39] qapi: Tweak doc references to QMP when QGA is also meant Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 38/39] qapi: Support (subset of) \u escapes in strings Eric Blake
2015-04-29 13:06 ` [Qemu-devel] [PATCH v7 39/39] qapi: Check for member name conflicts with a base class Eric Blake
2015-05-01 20:22 ` Eric Blake
2015-05-01 20:27 ` [Qemu-devel] [PATCH v7 39a/39] squash: " Eric Blake
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=1430312814-19706-6-git-send-email-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=armbru@redhat.com \
--cc=berto@igalia.com \
--cc=kwolf@redhat.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).