diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-04-09 14:30:58 -0400 |
---|---|---|
committer | Xavier Claessens <xclaesse@gmail.com> | 2021-05-28 15:17:10 -0400 |
commit | a734bcfc83a67788f71b5b84a46a4d9727b5ec09 (patch) | |
tree | c36f478aea7a741cbe78d8ba4a5ad0fb5c112d0e /mesonbuild/modules/python3.py | |
parent | 3340284805b96a4b9b62405f626020276341944c (diff) | |
download | meson-a734bcfc83a67788f71b5b84a46a4d9727b5ec09.zip meson-a734bcfc83a67788f71b5b84a46a4d9727b5ec09.tar.gz meson-a734bcfc83a67788f71b5b84a46a4d9727b5ec09.tar.bz2 |
modules: Stop using ModuleReturnValue where it's not needed
It is only needed in functions that need to add targets to the
interpreter.
Diffstat (limited to 'mesonbuild/modules/python3.py')
-rw-r--r-- | mesonbuild/modules/python3.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/modules/python3.py b/mesonbuild/modules/python3.py index 4dbb9b5..ac71049 100644 --- a/mesonbuild/modules/python3.py +++ b/mesonbuild/modules/python3.py @@ -16,7 +16,6 @@ import sysconfig 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 @@ -53,11 +52,11 @@ class Python3Module(ExtensionModule): py3 = ExternalProgram.from_entry('python3', command) else: py3 = ExternalProgram('python3', mesonlib.python_command, silent=True) - return ModuleReturnValue(py3, [py3]) + return py3 @noKwargs def language_version(self, state, args, kwargs): - return ModuleReturnValue(sysconfig.get_python_version(), []) + return sysconfig.get_python_version() @noKwargs def sysconfig_path(self, state, args, kwargs): @@ -69,8 +68,7 @@ class Python3Module(ExtensionModule): raise mesonlib.MesonException(f'{path_name} is not a valid path name {valid_names}.') # Get a relative path without a prefix, e.g. lib/python3.6/site-packages - path = sysconfig.get_path(path_name, vars={'base': '', 'platbase': '', 'installed_base': ''})[1:] - return ModuleReturnValue(path, []) + return sysconfig.get_path(path_name, vars={'base': '', 'platbase': '', 'installed_base': ''})[1:] def initialize(*args, **kwargs): |