From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54577) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVEOu-0001A8-My for qemu-devel@nongnu.org; Tue, 19 Jun 2018 07:02:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVEOq-0002gO-7D for qemu-devel@nongnu.org; Tue, 19 Jun 2018 07:02:16 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:42208 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fVEOq-0002gC-2R for qemu-devel@nongnu.org; Tue, 19 Jun 2018 07:02:12 -0400 References: <20180618175958.29073-1-armbru@redhat.com> <20180618175958.29073-2-armbru@redhat.com> From: Eric Blake Message-ID: Date: Tue, 19 Jun 2018 06:02:10 -0500 MIME-Version: 1.0 In-Reply-To: <20180618175958.29073-2-armbru@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 1/2] qapi: Open files with encoding='utf-8' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: tamiko@43-1.org, arfrever.fta@gmail.com On 06/18/2018 12:59 PM, Markus Armbruster wrote: > Python 2 happily reads UTF-8 files in text mode, but Python 3 requires > either UTF-8 locale or an explicit encoding passed to open(). Commit > d4e5ec877ca fixed this by setting the en_US.UTF-8 locale. Falls apart > when the locale isn't be available. > > Matthias Maier and Arfrever Frehtes Taifersar Arahesis proposed to use > binary mode instead, with manual conversion from bytes to str. Works, > but opening with an explicit encoding is simpler, so do that. > > Since Python 2's open() doesn't support the encoding parameter, we > need to suppress it with a version check. > > Reported-by: Arfrever Frehtes Taifersar Arahesis > Reported-by: Matthias Maier > Signed-off-by: Markus Armbruster > --- > scripts/qapi/common.py | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > Reviewed-by: Eric Blake -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org