diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-04-09 16:25:35 -0400 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-04-12 21:30:00 +0300 |
commit | 7ffe1b4a66828cacb3db4049a9c9eb6975eaf0bf (patch) | |
tree | 41c623ab0cfc850e0584d9e16973643fd084b9d4 /mesonbuild/modules | |
parent | 4c13aa30a1714b1fdbebb465f4621f332e241505 (diff) | |
download | meson-7ffe1b4a66828cacb3db4049a9c9eb6975eaf0bf.zip meson-7ffe1b4a66828cacb3db4049a9c9eb6975eaf0bf.tar.gz meson-7ffe1b4a66828cacb3db4049a9c9eb6975eaf0bf.tar.bz2 |
interpreter: Split permitted_kwargs dict
Diffstat (limited to 'mesonbuild/modules')
-rw-r--r-- | mesonbuild/modules/python.py | 4 | ||||
-rw-r--r-- | mesonbuild/modules/unstable_rust.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index f46f00e..422155b 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -26,7 +26,7 @@ from ..interpreterbase import ( InvalidArguments, FeatureNew, FeatureNewKwargs, disablerIfNotFound ) -from ..interpreter import ExternalProgramHolder, extract_required_kwarg, permitted_kwargs +from ..interpreter import ExternalProgramHolder, extract_required_kwarg, permitted_dependency_kwargs from ..build import known_shmod_kwargs from .. import mlog from ..environment import detect_cpu_family @@ -347,7 +347,7 @@ class PythonInstallation(ExternalProgramHolder): return self.interpreter.func_shared_module(None, args, kwargs) - @permittedKwargs(permitted_kwargs['dependency']) + @permittedKwargs(permitted_dependency_kwargs) @FeatureNewKwargs('python_installation.dependency', '0.53.0', ['embed']) def dependency_method(self, args, kwargs): if args: diff --git a/mesonbuild/modules/unstable_rust.py b/mesonbuild/modules/unstable_rust.py index 36d3164..7ae12c4 100644 --- a/mesonbuild/modules/unstable_rust.py +++ b/mesonbuild/modules/unstable_rust.py @@ -19,7 +19,7 @@ from . import ExtensionModule, ModuleReturnValue from .. import mlog from ..build import BuildTarget, CustomTargetIndex, Executable, GeneratedList, InvalidArguments, IncludeDirs, CustomTarget from ..dependencies import Dependency, ExternalLibrary -from ..interpreter import ExecutableHolder, BuildTargetHolder, CustomTargetHolder, permitted_kwargs +from ..interpreter import ExecutableHolder, BuildTargetHolder, CustomTargetHolder, permitted_test_kwargs from ..interpreterbase import InterpreterException, permittedKwargs, FeatureNew, typed_pos_args, noPosargs from ..mesonlib import stringlistify, unholder, listify, typeslistify, File @@ -38,7 +38,7 @@ class RustModule(ExtensionModule): super().__init__(interpreter) self._bindgen_bin: T.Optional['ExternalProgram'] = None - @permittedKwargs(permitted_kwargs['test'] | {'dependencies'} ^ {'protocol'}) + @permittedKwargs(permitted_test_kwargs | {'dependencies'} ^ {'protocol'}) @typed_pos_args('rust.test', str, BuildTargetHolder) def test(self, state: 'ModuleState', args: T.Tuple[str, BuildTargetHolder], kwargs: T.Dict[str, T.Any]) -> ModuleReturnValue: """Generate a rust test target from a given rust target. |