OSDN Git Service

qapi: Open files with encoding='utf-8'
authorMarkus Armbruster <armbru@redhat.com>
Mon, 18 Jun 2018 17:59:57 +0000 (19:59 +0200)
committerMarkus Armbruster <armbru@redhat.com>
Fri, 22 Jun 2018 14:33:46 +0000 (16:33 +0200)
commitde685ae5e9a4b523513033bd6cadc8187a227170
tree5a8572d98bcc12ce31ff1b5d559e38859bcc0367
parent29cd0403f19e4be928b50ce6247cee02c3dfd46b
qapi: Open files with encoding='utf-8'

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 <arfrever.fta@gmail.com>
Reported-by: Matthias Maier <tamiko@43-1.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180618175958.29073-2-armbru@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
scripts/qapi/common.py