aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter/interpreter.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-08-29 19:32:37 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-09-01 19:17:01 +0200
commit43a6b5bd5ea7d8f93d09b9962a8f47737641be53 (patch)
tree40bce373e06b2efc4a1ef74a3a3112b3a95d2b40 /mesonbuild/interpreter/interpreter.py
parentea02c1c48a8a11aab78bd535d18fb17fdf62ae33 (diff)
downloadmeson-43a6b5bd5ea7d8f93d09b9962a8f47737641be53.zip
meson-43a6b5bd5ea7d8f93d09b9962a8f47737641be53.tar.gz
meson-43a6b5bd5ea7d8f93d09b9962a8f47737641be53.tar.bz2
interpreter: Remove permissive from _unholder
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
-rw-r--r--mesonbuild/interpreter/interpreter.py4
1 files changed, 2 insertions, 2 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)