diff options
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/__init__.py | 13 | ||||
| -rw-r--r-- | mesonbuild/modules/python.py | 7 | ||||
| -rw-r--r-- | mesonbuild/modules/python3.py | 5 |
3 files changed, 5 insertions, 20 deletions
diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index e871b87..e461144 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -3,19 +3,6 @@ import os from .. import build from .. import mlog -class permittedSnippetKwargs: - - def __init__(self, permitted): - self.permitted = permitted - - def __call__(self, f): - def wrapped(s, interpreter, state, args, kwargs): - for k in kwargs: - if k not in self.permitted: - mlog.warning('Passed invalid keyword argument "%s". This will become a hard error in the future.' % k) - return f(s, interpreter, state, args, kwargs) - return wrapped - class ExtensionModule: def __init__(self, interpreter): diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py index db9d39d..b9b6a4f 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py @@ -19,7 +19,6 @@ from pathlib import Path from .. import mesonlib from . import ExtensionModule from mesonbuild.modules import ModuleReturnValue -from . import permittedSnippetKwargs from ..interpreterbase import ( noPosargs, noKwargs, permittedKwargs, InterpreterObject, InvalidArguments, @@ -284,7 +283,7 @@ class PythonInstallation(ExternalProgramHolder, InterpreterObject): self.platform = run_command(python, "import sysconfig; print (sysconfig.get_platform())") self.is_pypy = json.loads(run_command(python, IS_PYPY_COMMAND)) - @permittedSnippetKwargs(mod_kwargs) + @permittedKwargs(mod_kwargs) def extension_module(self, interpreter, state, args, kwargs): if 'subdir' in kwargs and 'install_dir' in kwargs: raise InvalidArguments('"subdir" and "install_dir" are mutually exclusive') @@ -312,7 +311,7 @@ class PythonInstallation(ExternalProgramHolder, InterpreterObject): dep = PythonDependency(self, interpreter.environment, kwargs) return interpreter.holderify(dep) - @permittedSnippetKwargs(['pure', 'subdir']) + @permittedKwargs(['pure', 'subdir']) def install_sources(self, interpreter, state, args, kwargs): pure = kwargs.pop('pure', False) if not isinstance(pure, bool): @@ -450,7 +449,7 @@ class PythonModule(ExtensionModule): else: return None - @permittedSnippetKwargs(['required']) + @permittedKwargs(['required']) def find_installation(self, interpreter, state, args, kwargs): required = kwargs.get('required', True) if not isinstance(required, bool): diff --git a/mesonbuild/modules/python3.py b/mesonbuild/modules/python3.py index 79da29a..3cfc689 100644 --- a/mesonbuild/modules/python3.py +++ b/mesonbuild/modules/python3.py @@ -17,8 +17,7 @@ from .. import mesonlib, dependencies from . import ExtensionModule from mesonbuild.modules import ModuleReturnValue -from . import permittedSnippetKwargs -from ..interpreterbase import noKwargs +from ..interpreterbase import noKwargs, permittedKwargs from ..build import known_shmod_kwargs @@ -27,7 +26,7 @@ class Python3Module(ExtensionModule): super().__init__(*args, **kwargs) self.snippets.add('extension_module') - @permittedSnippetKwargs(known_shmod_kwargs) + @permittedKwargs(known_shmod_kwargs) def extension_module(self, interpreter, state, args, kwargs): if 'name_prefix' in kwargs: raise mesonlib.MesonException('Name_prefix is set automatically, specifying it is forbidden.') |