diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 21:21:23 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-03-20 21:21:23 +0200 |
| commit | 8b619420f994f5c77eb6540262277a0e668d7899 (patch) | |
| tree | fd3b7114300ec53ea68e6bbe5a42928ffab9d7c6 /mesonbuild/interpreter.py | |
| parent | 4bb665a577a90e3bc0d2e832d6950f0323a72492 (diff) | |
| download | meson-8b619420f994f5c77eb6540262277a0e668d7899.zip meson-8b619420f994f5c77eb6540262277a0e668d7899.tar.gz meson-8b619420f994f5c77eb6540262277a0e668d7899.tar.bz2 | |
Open Meson and option files explicitly as utf-8. Closes #467.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 2 insertions, 2 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() |