From 63ade7d9378cae8ec2a811581684bf459407a7f0 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Fri, 11 Jun 2021 16:58:13 +0200 Subject: interpreter: Add a new MesonInterpreterObject for non-elementary objects --- mesonbuild/interpreter/interpreter.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild/interpreter/interpreter.py') 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.') -- cgit v1.1