diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-28 17:22:14 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-02 17:14:44 +0300 |
| commit | 971a0b1775ef80fc0877b3b90f75803f197c866b (patch) | |
| tree | 40f206fa6112707dfc0600546c072e104a55c5e1 /mesonbuild/interpreter/interpreterobjects.py | |
| parent | 5bb93490c4c15198bcd230ecf64d3e5c5ef17951 (diff) | |
| download | meson-971a0b1775ef80fc0877b3b90f75803f197c866b.zip meson-971a0b1775ef80fc0877b3b90f75803f197c866b.tar.gz meson-971a0b1775ef80fc0877b3b90f75803f197c866b.tar.bz2 | |
fix: get_variable default variables are not ObjectHolders (fixes #8936)
Diffstat (limited to 'mesonbuild/interpreter/interpreterobjects.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index 03725b9..76d5b16 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, KwargInfo, stringArgs, permittedKwargs, - noArgsFlattening, noPosargs, noKwargs, unholder_return, TYPE_var, TYPE_kwargs, TYPE_nvar, TYPE_nkwargs, + noArgsFlattening, noPosargs, noKwargs, permissive_unholder_return, TYPE_var, TYPE_kwargs, TYPE_nvar, TYPE_nkwargs, flatten, resolve_second_level_holders, InterpreterException, InvalidArguments, InvalidCode) from ..dependencies import Dependency, ExternalLibrary, InternalDependency from ..programs import ExternalProgram @@ -727,7 +727,7 @@ class SubprojectHolder(MesonInterpreterObject): @noKwargs @noArgsFlattening - @unholder_return + @permissive_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.') |