diff options
author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-22 22:59:16 +0200 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-29 11:28:08 +0200 |
commit | 3e396b3782813d36d46195564cd0e111422bcaf5 (patch) | |
tree | f315e990f71984745fcb8f22dac2f0e400fecadb /mesonbuild/mesonlib | |
parent | 28175bbee2c111cf41b80c97bbadd7dbabaa8990 (diff) | |
download | meson-3e396b3782813d36d46195564cd0e111422bcaf5.zip meson-3e396b3782813d36d46195564cd0e111422bcaf5.tar.gz meson-3e396b3782813d36d46195564cd0e111422bcaf5.tar.bz2 |
fix: Always explicitly set encoding for text files (fixes #8263)
Diffstat (limited to 'mesonbuild/mesonlib')
-rw-r--r-- | mesonbuild/mesonlib/posix.py | 2 | ||||
-rw-r--r-- | mesonbuild/mesonlib/universal.py | 6 | ||||
-rw-r--r-- | mesonbuild/mesonlib/win32.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/mesonlib/posix.py b/mesonbuild/mesonlib/posix.py index 1d8ba8c..67f9a44 100644 --- a/mesonbuild/mesonlib/posix.py +++ b/mesonbuild/mesonlib/posix.py @@ -27,7 +27,7 @@ __all__ = ['BuildDirLock'] class BuildDirLock(BuildDirLockBase): def __enter__(self) -> None: - self.lockfile = open(self.lockfilename, 'w') + self.lockfile = open(self.lockfilename, 'w', encoding='utf-8') try: fcntl.flock(self.lockfile, fcntl.LOCK_EX | fcntl.LOCK_NB) except (BlockingIOError, PermissionError): diff --git a/mesonbuild/mesonlib/universal.py b/mesonbuild/mesonlib/universal.py index 0ed99a5..c500e15 100644 --- a/mesonbuild/mesonlib/universal.py +++ b/mesonbuild/mesonlib/universal.py @@ -1359,7 +1359,7 @@ def expand_arguments(args: T.Iterable[str]) -> T.Optional[T.List[str]]: args_file = arg[1:] try: - with open(args_file) as f: + with open(args_file, encoding='utf-8') as f: extended_args = f.read().split() expended_args += extended_args except Exception as e: @@ -1854,11 +1854,11 @@ def get_wine_shortpath(winecmd: T.List[str], wine_paths: T.Sequence[str]) -> str wine_paths = list(OrderedSet(wine_paths)) getShortPathScript = '%s.bat' % str(uuid.uuid4()).lower()[:5] - with open(getShortPathScript, mode='w') as f: + with open(getShortPathScript, mode='w', encoding='utf-8') as f: f.write("@ECHO OFF\nfor %%x in (%*) do (\n echo|set /p=;%~sx\n)\n") f.flush() try: - with open(os.devnull, 'w') as stderr: + with open(os.devnull, 'w', encoding='utf-8') as stderr: wine_path = subprocess.check_output( winecmd + ['cmd', '/C', getShortPathScript] + wine_paths, diff --git a/mesonbuild/mesonlib/win32.py b/mesonbuild/mesonlib/win32.py index 0919ef7..bc0caec 100644 --- a/mesonbuild/mesonlib/win32.py +++ b/mesonbuild/mesonlib/win32.py @@ -27,7 +27,7 @@ __all__ = ['BuildDirLock'] class BuildDirLock(BuildDirLockBase): def __enter__(self) -> None: - self.lockfile = open(self.lockfilename, 'w') + self.lockfile = open(self.lockfilename, 'w', encoding='utf-8') try: msvcrt.locking(self.lockfile.fileno(), msvcrt.LK_NBLCK, 1) except (BlockingIOError, PermissionError): |