diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-11 16:58:13 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-18 23:48:33 +0200 |
| commit | 63ade7d9378cae8ec2a811581684bf459407a7f0 (patch) | |
| tree | 8cbc21520642db608b529f04d01fe25f89149ad3 /mesonbuild/interpreter/interpreter.py | |
| parent | 202e345dfba7ff3a39e4fb560b98889182dcc506 (diff) | |
| download | meson-63ade7d9378cae8ec2a811581684bf459407a7f0.zip meson-63ade7d9378cae8ec2a811581684bf459407a7f0.tar.gz meson-63ade7d9378cae8ec2a811581684bf459407a7f0.tar.bz2 | |
interpreter: Add a new MesonInterpreterObject for non-elementary objects
Diffstat (limited to 'mesonbuild/interpreter/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 93cabec..726a240 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -394,7 +394,7 @@ class Interpreter(InterpreterBase): if isinstance(item, build.CustomTarget): return CustomTargetHolder(item, self) - elif isinstance(item, (int, str, bool, Disabler, InterpreterObject, mesonlib.File)) or item is None: + elif isinstance(item, (int, str, bool, InterpreterObject, mesonlib.File)) or item is None: return item elif isinstance(item, build.Executable): return ExecutableHolder(item, self) @@ -414,7 +414,7 @@ class Interpreter(InterpreterBase): return MutableModuleObjectHolder(item, self) elif isinstance(item, ModuleObject): return ModuleObjectHolder(item, self) - elif isinstance(item, (InterpreterObject, ObjectHolder)): + elif isinstance(item, InterpreterObject): return item else: raise InterpreterException('Module returned a value of unknown type.') |