[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 05/39] qapi: Require ASCII in schema
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v7 05/39] qapi: Require ASCII in schema |
Date: |
Wed, 29 Apr 2015 07:06:20 -0600 |
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 <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
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 <address@hidden>
@@ -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
- [Qemu-devel] [PATCH v7 20/39] qapi: Better error messages for duplicated expressions, (continued)
- [Qemu-devel] [PATCH v7 20/39] qapi: Better error messages for duplicated expressions, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 34/39] qapi: Drop inline nested struct in query-version, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 30/39] qapi: Use 'struct' instead of 'type' in schema, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 37/39] qapi: Tweak doc references to QMP when QGA is also meant, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 24/39] qapi: More rigourous checking of types, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 38/39] qapi: Support (subset of) \u escapes in strings, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 28/39] qapi: Prefer 'struct' over 'type' in generator, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 32/39] qapi: Merge UserDefTwo and UserDefNested in tests, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 39/39] qapi: Check for member name conflicts with a base class, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 04/39] qapi: Fix generation of 'size' builtin type, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 05/39] qapi: Require ASCII in schema,
Eric Blake <=
- [Qemu-devel] [PATCH v7 01/39] qapi: Add copyright declaration on docs, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 09/39] qapi: Clean up test coverage of simple unions, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 07/39] qapi: Better error messages for bad enums, Eric Blake, 2015/04/29
- [Qemu-devel] [PATCH v7 08/39] qapi: Add some union tests, Eric Blake, 2015/04/29