aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-03-20 21:21:23 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-03-20 21:21:23 +0200
commit8b619420f994f5c77eb6540262277a0e668d7899 (patch)
treefd3b7114300ec53ea68e6bbe5a42928ffab9d7c6
parent4bb665a577a90e3bc0d2e832d6950f0323a72492 (diff)
downloadmeson-8b619420f994f5c77eb6540262277a0e668d7899.zip
meson-8b619420f994f5c77eb6540262277a0e668d7899.tar.gz
meson-8b619420f994f5c77eb6540262277a0e668d7899.tar.bz2
Open Meson and option files explicitly as utf-8. Closes #467.
-rw-r--r--mesonbuild/interpreter.py4
-rw-r--r--mesonbuild/optinterpreter.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index f4b6958..04bfa07 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -925,7 +925,7 @@ class Interpreter():
mesonfile = os.path.join(self.source_root, self.subdir, environment.build_filename)
if not os.path.isfile(mesonfile):
raise InvalidArguments('Missing Meson file in %s' % mesonfile)
- code = open(mesonfile).read()
+ code = open(mesonfile, encoding='utf8').read()
if len(code.strip()) == 0:
raise InvalidCode('Builder file is empty.')
assert(isinstance(code, str))
@@ -1783,7 +1783,7 @@ class Interpreter():
absname = os.path.join(self.environment.get_source_dir(), buildfilename)
if not os.path.isfile(absname):
raise InterpreterException('Nonexistant build def file %s.' % buildfilename)
- code = open(absname).read()
+ code = open(absname, encoding='utf8').read()
assert(isinstance(code, str))
try:
codeblock = mparser.Parser(code).parse()
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py
index f0c93ae..30a26ab 100644
--- a/mesonbuild/optinterpreter.py
+++ b/mesonbuild/optinterpreter.py
@@ -73,7 +73,7 @@ class OptionInterpreter:
def process(self, option_file):
try:
- ast = mparser.Parser(open(option_file, 'r').read()).parse()
+ ast = mparser.Parser(open(option_file, 'r', encoding='utf8').read()).parse()
except coredata.MesonException as me:
me.file = option_file
raise me