diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py index fe778aff6c90..55d9c1a1476c 100644 --- a/mesonbuild/dependencies/python.py +++ b/mesonbuild/dependencies/python.py @@ -15,6 +15,7 @@ import functools, json, os, textwrap from pathlib import Path +import sys import typing as T from .. import mesonlib, mlog @@ -112,8 +113,13 @@ def sanity(self) -> bool: # Sanity check, we expect to have something that at least quacks in tune import importlib.resources + if sys.version_info >= (3, 13): + traversable = importlib.resources.files('mesonbuild.scripts').joinpath('python_info.py') + context_mgr = importlib.resources.as_file(traversable) + else: + context_mgr = importlib.resources.path('mesonbuild.scripts', 'python_info.py') - with importlib.resources.path('mesonbuild.scripts', 'python_info.py') as f: + with context_mgr as f: cmd = self.get_command() + [str(f)] env = os.environ.copy() env['SETUPTOOLS_USE_DISTUTILS'] = 'stdlib' diff --git a/mesonbuild/mesondata.py b/mesonbuild/mesondata.py index da641fda7593..c80661e2bf50 100644 --- a/mesonbuild/mesondata.py +++ b/mesonbuild/mesondata.py @@ -27,10 +27,12 @@ def __init__(self, path: str) -> None: def write_once(self, path: Path) -> None: if not path.exists(): - data = importlib.resources.read_text( # [ignore encoding] it's on the next lines, Mr. Lint - ('mesonbuild' / self.path.parent).as_posix().replace('/', '.'), - self.path.name, - encoding='utf-8') + + package = ('mesonbuild' / self.path.parent).as_posix().replace('/', '.') + if sys.version_info >= (3, 13): + data = importlib.resources.files(package).joinpath(self.path.name).read_text(encoding='utf-8') + else: + data = importlib.resources.read_text(package, self.path.name, encoding='utf-8') path.write_text(data, encoding='utf-8') def write_to_private(self, env: 'Environment') -> Path: diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index ec95374d38ab..926a09b20075 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -13,7 +13,7 @@ # limitations under the License. from __future__ import annotations -import copy, json, os, shutil, re +import copy, json, os, shutil, re, sys import typing as T from . import ExtensionModule, ModuleInfo @@ -407,7 +407,10 @@ def should_append(f, isdir: bool = False): import importlib.resources pycompile = os.path.join(self.interpreter.environment.get_scratch_dir(), 'pycompile.py') with open(pycompile, 'wb') as f: - f.write(importlib.resources.read_binary('mesonbuild.scripts', 'pycompile.py')) + if sys.version_info >= (3, 13): + f.write(importlib.resources.files('mesonbuild.scripts').joinpath('pycompile.py').read_bytes()) + else: + f.write(importlib.resources.read_binary('mesonbuild.scripts', 'pycompile.py')) for i in self.installations.values(): if isinstance(i, PythonExternalProgram) and i.run_bytecompile[i.info['version']]: