diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index 473465452..e4f2ce83e 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -224,7 +224,7 @@ print (json.dumps(sysconfig.get_paths(scheme='posix_prefix', vars={'base': '', ' ''' -class PythonHolder(ExternalProgramHolder, InterpreterObject): +class PythonInstallation(ExternalProgramHolder, InterpreterObject): def __init__(self, interpreter, python): InterpreterObject.__init__(self) ExternalProgramHolder.__init__(self, python) @@ -365,7 +365,7 @@ class PythonHolder(ExternalProgramHolder, InterpreterObject): class PythonModule(ExtensionModule): def __init__(self): super().__init__() - self.snippets.add('find') + self.snippets.add('find_installation') # https://www.python.org/dev/peps/pep-0397/ def _get_win_pythonpath(self, name_or_path): @@ -381,7 +381,7 @@ class PythonModule(ExtensionModule): return None @permittedSnippetKwargs(['required']) - def find(self, interpreter, state, args, kwargs): + def find_installation(self, interpreter, state, args, kwargs): required = kwargs.get('required', True) if not isinstance(required, bool): raise InvalidArguments('"required" argument must be a boolean.') @@ -428,7 +428,7 @@ class PythonModule(ExtensionModule): if not version: res = ExternalProgramHolder(NonExistingExternalProgram()) else: - res = PythonHolder(interpreter, python) + res = PythonInstallation(interpreter, python) return res diff --git a/test cases/python/1 extmodule/meson.build b/test cases/python/1 extmodule/meson.build index 0e24a70d9..479865482 100644 --- a/test cases/python/1 extmodule/meson.build +++ b/test cases/python/1 extmodule/meson.build @@ -3,7 +3,7 @@ project('Python extension module', 'c', py_mod = import('python') -py = py_mod.find(get_option('python'), required : false) +py = py_mod.find_installation(get_option('python'), required : false) if py.found() py_dep = py.dependency()