[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] qapi: Open files with encoding='utf-8'
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 07/10] qapi: Open files with encoding='utf-8' |
Date: |
Fri, 22 Jun 2018 17:32:25 +0200 |
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 <address@hidden>
Reported-by: Matthias Maier <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi/common.py | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 4b53f08627..8b6708dbf1 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -16,6 +16,7 @@ import errno
import os
import re
import string
+import sys
from collections import OrderedDict
builtin_types = {
@@ -340,7 +341,10 @@ class QAPISchemaParser(object):
return None
try:
- fobj = open(incl_fname, 'r')
+ if sys.version_info[0] >= 3:
+ fobj = open(incl_fname, 'r', encoding='utf-8')
+ else:
+ fobj = open(incl_fname, 'r')
except IOError as e:
raise QAPISemError(info, '%s: %s' % (e.strerror, incl_fname))
return QAPISchemaParser(fobj, previously_included, info)
@@ -1493,7 +1497,11 @@ class QAPISchemaEvent(QAPISchemaEntity):
class QAPISchema(object):
def __init__(self, fname):
self._fname = fname
- parser = QAPISchemaParser(open(fname, 'r'))
+ if sys.version_info[0] >= 3:
+ f = open(fname, 'r', encoding='utf-8')
+ else:
+ f = open(fname, 'r')
+ parser = QAPISchemaParser(f)
exprs = check_exprs(parser.exprs)
self.docs = parser.docs
self._entity_list = []
@@ -2007,7 +2015,10 @@ class QAPIGen(object):
if e.errno != errno.EEXIST:
raise
fd = os.open(pathname, os.O_RDWR | os.O_CREAT, 0o666)
- f = os.fdopen(fd, 'r+')
+ if sys.version_info[0] >= 3:
+ f = open(fd, 'r+', encoding='utf-8')
+ else:
+ f = os.fdopen(fd, 'r+')
text = (self._top(fname) + self._preamble + self._body
+ self._bottom(fname))
oldtext = f.read(len(text) + 1)
--
2.17.1
- [Qemu-devel] [PULL 00/10] QAPI patches for 2018-06-22, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 02/10] qapi/events: generate event enum in main module, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 08/10] Revert commit d4e5ec877ca, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 03/10] qdict: Make qdict_flatten() shallow-clone-friendly, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 04/10] tests: Add QDict clone-flatten test, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 05/10] qapi: allow empty branches in flat unions, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 07/10] qapi: Open files with encoding='utf-8',
Markus Armbruster <=
- [Qemu-devel] [PULL 06/10] qapi: remove empty flat union branches and types, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 01/10] qapi/visit: remove useless prefix argument, Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 09/10] qapi/introspect: Eliminate pointless variable in .visit_end(), Markus Armbruster, 2018/06/22
- [Qemu-devel] [PULL 10/10] MAINTAINERS: Update QAPI stanza for commit fb0bc835e56, Markus Armbruster, 2018/06/22
- Re: [Qemu-devel] [PULL 00/10] QAPI patches for 2018-06-22, Peter Maydell, 2018/06/22