From 40e3577a65ac688814eff1239fa38b86aad19ee8 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 1 Oct 2020 13:02:08 -0700 Subject: split program related classes and functions out of dependencies Dependencies is already a large and complicated package without adding programs to the list. This also allows us to untangle a bit of spaghetti that we have. --- mesonbuild/modules/python3.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'mesonbuild/modules/python3.py') diff --git a/mesonbuild/modules/python3.py b/mesonbuild/modules/python3.py index 881596611..e7a2bb344 100644 --- a/mesonbuild/modules/python3.py +++ b/mesonbuild/modules/python3.py @@ -13,12 +13,13 @@ # limitations under the License. import sysconfig -from .. import mesonlib, dependencies +from .. import mesonlib from . import ExtensionModule from mesonbuild.modules import ModuleReturnValue from ..interpreterbase import noKwargs, permittedKwargs, FeatureDeprecated from ..build import known_shmod_kwargs +from ..programs import ExternalProgram class Python3Module(ExtensionModule): @@ -50,9 +51,9 @@ class Python3Module(ExtensionModule): def find_python(self, state, args, kwargs): command = state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3') if command is not None: - py3 = dependencies.ExternalProgram.from_entry('python3', command) + py3 = ExternalProgram.from_entry('python3', command) else: - py3 = dependencies.ExternalProgram('python3', mesonlib.python_command, silent=True) + py3 = ExternalProgram('python3', mesonlib.python_command, silent=True) return ModuleReturnValue(py3, [py3]) @noKwargs -- cgit v1.2.3