[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 05/40] qapi: Require ASCII in schema
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v8 05/40] qapi: Require ASCII in schema |
Date: |
Mon, 4 May 2015 09:05:02 -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 v8 00/40] drop qapi nested structs, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 04/40] qapi: Fix generation of 'size' builtin type, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 03/40] qapi: Simplify builtin type handling, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 05/40] qapi: Require ASCII in schema,
Eric Blake <=
- [Qemu-devel] [PATCH v8 09/40] qapi: Clean up test coverage of simple unions, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 07/40] qapi: Better error messages for bad enums, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 10/40] qapi: Forbid base without discriminator in unions, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 13/40] qapi: Segregate anonymous unions into alternates in generator, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 15/40] qapi: Document new 'alternate' meta-type, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 12/40] qapi: Prepare for catching more semantic parse errors, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 14/40] qapi: Rename anonymous union type in test, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 19/40] qapi: Add tests of redefined expressions, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 17/40] qapi: Add some expr tests, Eric Blake, 2015/05/04
- [Qemu-devel] [PATCH v8 16/40] qapi: Use 'alternate' to replace anonymous union, Eric Blake, 2015/05/04