diff options
author | Markus Armbruster <armbru@redhat.com> | 2018-06-18 19:59:57 +0200 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2018-06-22 16:33:46 +0200 |
commit | de685ae5e9a4b523513033bd6cadc8187a227170 (patch) | |
tree | 5a8572d98bcc12ce31ff1b5d559e38859bcc0367 /Makefile | |
parent | 29cd0403f19e4be928b50ce6247cee02c3dfd46b (diff) |
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions