diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-07-01 23:32:08 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2018-07-02 07:05:08 +0000 |
| commit | 817dcaa23b92d37339a157ee637ebf361663054b (patch) | |
| tree | 3cbc7075bfc5013a19ca58570da2141567ed1f9e /mesonbuild/modules/python.py | |
| parent | d0c5fddd7235eb054a47ac319a4a3e9839c7e66c (diff) | |
| download | meson-817dcaa23b92d37339a157ee637ebf361663054b.zip meson-817dcaa23b92d37339a157ee637ebf361663054b.tar.gz meson-817dcaa23b92d37339a157ee637ebf361663054b.tar.bz2 | |
Remove permittedSnippetKwargs, snippets are not special
All we needed to do was change _get_callee_args() to also support
snippets.
Diffstat (limited to 'mesonbuild/modules/python.py')
| -rw-r--r-- | mesonbuild/modules/python.py | 7 |
1 files changed, 3 insertions, 4 deletions
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): |