Skip to content

BUG: be more careful with encodings #623

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 1, 2024
Merged

BUG: be more careful with encodings #623

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05719ac
BUG: the native and cross files must be UTF-8 encoded
dnicolodi Apr 28, 2024
877c4e5
BUG: pyproject.toml must be UTF-8 encoded
dnicolodi Apr 28, 2024
7af999b
BUG: Meson introspection data is UTF-8 encoded
dnicolodi Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mesonpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ def __init__(
self._limited_api = False

# load pyproject.toml
pyproject = tomllib.loads(self._source_dir.joinpath('pyproject.toml').read_text())
pyproject = tomllib.loads(self._source_dir.joinpath('pyproject.toml').read_text(encoding='utf-8'))

# load meson args from pyproject.toml
pyproject_config = _validate_pyproject_config(pyproject)
Expand Down Expand Up @@ -703,15 +703,15 @@ def __init__(
cpu_family = {family!r}
endian = 'little'
''')
self._meson_cross_file.write_text(cross_file_data)
self._meson_cross_file.write_text(cross_file_data, encoding='utf-8')
self._meson_args['setup'].extend(('--cross-file', os.fspath(self._meson_cross_file)))

# write the native file
native_file_data = textwrap.dedent(f'''
[binaries]
python = '{sys.executable}'
''')
self._meson_native_file.write_text(native_file_data)
self._meson_native_file.write_text(native_file_data, encoding='utf-8')

# reconfigure if we have a valid Meson build directory. Meson
# uses the presence of the 'meson-private/coredata.dat' file
Expand Down Expand Up @@ -818,7 +818,7 @@ def build(self) -> None:
def _info(self, name: str) -> Any:
"""Read info from meson-info directory."""
info = self._build_dir.joinpath('meson-info', f'{name}.json')
return json.loads(info.read_text())
return json.loads(info.read_text(encoding='utf-8'))

@property
def _manifest(self) -> DefaultDict[str, List[Tuple[pathlib.Path, str]]]:
Expand Down