From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yebr8-0008Sr-En for qemu-devel@nongnu.org; Sun, 05 Apr 2015 00:08:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yebr6-0002nb-EY for qemu-devel@nongnu.org; Sun, 05 Apr 2015 00:08:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51439) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yebr6-0002nX-9y for qemu-devel@nongnu.org; Sun, 05 Apr 2015 00:08:16 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 126D98E7AD for ; Sun, 5 Apr 2015 04:08:16 +0000 (UTC) From: Eric Blake Date: Sat, 4 Apr 2015 22:07:36 -0600 Message-Id: <1428206887-7921-6-git-send-email-eblake@redhat.com> In-Reply-To: <1428206887-7921-1-git-send-email-eblake@redhat.com> References: <1428206887-7921-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v6 05/36] qapi: Require ASCII in schema List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, berto@igalia.co, armbru@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 Reviewed-by: Markus Armbruster --- v6: no change --- 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 @@ -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