From 5c87167a34c6ed703444af180fffd8a45a7928ee Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sat, 31 Jul 2021 17:51:05 +0200 Subject: interpreter: Fix list contains for Holders (fixes #9020 #9047) --- mesonbuild/interpreterbase/interpreterbase.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mesonbuild') diff --git a/mesonbuild/interpreterbase/interpreterbase.py b/mesonbuild/interpreterbase/interpreterbase.py index b8a6d1a..115e24b 100644 --- a/mesonbuild/interpreterbase/interpreterbase.py +++ b/mesonbuild/interpreterbase/interpreterbase.py @@ -783,7 +783,7 @@ The result of this is undefined and will become a hard error in a future Meson r posargs: T.List[TYPE_var], kwargs: TYPE_kwargs) -> T.Union[TYPE_var, InterpreterObject]: if method_name == 'contains': - def check_contains(el: list) -> bool: + def check_contains(el: T.List[TYPE_var]) -> bool: if len(posargs) != 1: raise InterpreterException('Contains method takes exactly one argument.') item = posargs[0] @@ -795,7 +795,7 @@ The result of this is undefined and will become a hard error in a future Meson r if element == item: return True return False - return check_contains(obj) + return check_contains([_unholder(x) for x in obj]) elif method_name == 'length': return len(obj) elif method_name == 'get': -- cgit v1.1