diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-06-29 20:52:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 20:52:55 +0300 |
| commit | 4bfee181c5a166e3d429bd265e06d299dce50f30 (patch) | |
| tree | 8918a0e09f668ed55748ec254c51b4d92b5403a9 /mesonbuild/interpreter/interpreter.py | |
| parent | 81ca0ec7ae975723b8b399b9f142286895a45dab (diff) | |
| parent | c0a2025d038a08092212bfc45e7bbb46ff1e8e52 (diff) | |
| download | meson-4bfee181c5a166e3d429bd265e06d299dce50f30.zip meson-4bfee181c5a166e3d429bd265e06d299dce50f30.tar.gz meson-4bfee181c5a166e3d429bd265e06d299dce50f30.tar.bz2 | |
Merge pull request #8918 from mensinda/pathlibFixes
pathlib: Patch pathlib to work around some bugs (fixes #8263 #7295)
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index e4fb0d4..1a9872d 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -973,7 +973,7 @@ external dependencies (including libraries) must go to "dependencies".''') ast.accept(printer) printer.post_process() meson_filename = os.path.join(self.build.environment.get_build_dir(), subdir, 'meson.build') - with open(meson_filename, "w") as f: + with open(meson_filename, "w", encoding='utf-8') as f: f.write(printer.result) mlog.log('Build file:', meson_filename) @@ -1964,7 +1964,7 @@ This will become a hard error in the future.''' % kwargs['input'], location=self if not os.path.isfile(absname): self.subdir = prev_subdir raise InterpreterException(f"Non-existent build file '{buildfilename!s}'") - with open(absname, encoding='utf8') as f: + with open(absname, encoding='utf-8') as f: code = f.read() assert(isinstance(code, str)) try: @@ -2198,7 +2198,7 @@ This will become a hard error in the future.''' % kwargs['input'], location=self mesonlib.replace_if_different(ofile_abs, dst_tmp) if depfile: mlog.log('Reading depfile:', mlog.bold(depfile)) - with open(depfile) as f: + with open(depfile, encoding='utf-8') as f: df = DepFile(f.readlines()) deps = df.get_all_dependencies(ofile_fname) for dep in deps: |