diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-08-29 19:32:37 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-09-01 19:17:01 +0200 |
| commit | 43a6b5bd5ea7d8f93d09b9962a8f47737641be53 (patch) | |
| tree | 40bce373e06b2efc4a1ef74a3a3112b3a95d2b40 /mesonbuild/interpreter | |
| parent | ea02c1c48a8a11aab78bd535d18fb17fdf62ae33 (diff) | |
| download | meson-43a6b5bd5ea7d8f93d09b9962a8f47737641be53.zip meson-43a6b5bd5ea7d8f93d09b9962a8f47737641be53.tar.gz meson-43a6b5bd5ea7d8f93d09b9962a8f47737641be53.tar.bz2 | |
interpreter: Remove permissive from _unholder
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index c3e9b48..d4d5564 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -2643,7 +2643,7 @@ This will become a hard error in the future.''', location=self.current_node) @typed_pos_args('get_variable', (str, Disabler), optargs=[object]) @noKwargs @noArgsFlattening - @permissive_unholder_return + @unholder_return def func_get_variable(self, node: mparser.BaseNode, args: T.Tuple[T.Union[str, Disabler], T.Optional[object]], kwargs: 'TYPE_kwargs') -> 'TYPE_var': varname, fallback = args @@ -2654,7 +2654,7 @@ This will become a hard error in the future.''', location=self.current_node) return self.variables[varname] except KeyError: if fallback is not None: - return fallback + return self._holderify(fallback) raise InterpreterException(f'Tried to get unknown variable "{varname}".') @typed_pos_args('is_variable', str) diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index b0fe512..78c7fb9 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -18,7 +18,7 @@ from ..interpreterbase import ( InterpreterObject, MesonInterpreterObject, ObjectHolder, MutableInterpreterObject, FeatureCheckBase, FeatureNewKwargs, FeatureNew, FeatureDeprecated, typed_pos_args, typed_kwargs, permittedKwargs, - noArgsFlattening, noPosargs, noKwargs, permissive_unholder_return, TYPE_var, TYPE_kwargs, TYPE_nvar, TYPE_nkwargs, + noArgsFlattening, noPosargs, noKwargs, unholder_return, TYPE_var, TYPE_kwargs, TYPE_nvar, TYPE_nkwargs, flatten, resolve_second_level_holders, InterpreterException, InvalidArguments, InvalidCode) from ..interpreter.type_checking import NoneType from ..dependencies import Dependency, ExternalLibrary, InternalDependency @@ -712,7 +712,7 @@ class SubprojectHolder(MesonInterpreterObject): @noKwargs @noArgsFlattening - @permissive_unholder_return + @unholder_return def get_variable_method(self, args: T.List[TYPE_var], kwargs: TYPE_kwargs) -> T.Union[TYPE_var, InterpreterObject]: if len(args) < 1 or len(args) > 2: raise InterpreterException('Get_variable takes one or two arguments.') @@ -727,7 +727,7 @@ class SubprojectHolder(MesonInterpreterObject): pass if len(args) == 2: - return args[1] + return self.held_object._holderify(args[1]) raise InvalidArguments(f'Requested variable "{varname}" not found.') |