interpreter: Holderify arrays and dicts

This is the final refactoring for extracting the bultin object
logic out of Interpreterbase. I decided to do both arrays and
dicts in one go since splitting it would have been a lot more
confusing.

1 files changed, 2 insertions, 8 deletions

diff --git a/mesonbuild/interpreterbase/_unholder.py b/mesonbuild/interpreterbase/_unholder.py
index 221c52c..7157d17 100644
--- a/mesonbuild/interpreterbase/_unholder.py
+++ b/mesonbuild/interpreterbase/_unholder.py
@@ -16,14 +16,8 @@ from .baseobjects import InterpreterObject, MesonInterpreterObject, ObjectHolder
 from .exceptions import InvalidArguments
 from ..mesonlib import HoldableObject, MesonBugException
 
-import typing as T
-
-def _unholder(obj: T.Union[TYPE_var, InterpreterObject]) -> TYPE_var:
-    if isinstance(obj, list):
-        return [_unholder(x) for x in obj]
-    elif isinstance(obj, dict):
-        return {k: _unholder(v) for k, v in obj.items()}
-    elif isinstance(obj, ObjectHolder):
+def _unholder(obj: InterpreterObject) -> TYPE_var:
+    if isinstance(obj, ObjectHolder):
         assert isinstance(obj.held_object, HoldableTypes)
         return obj.held_object
     elif isinstance(obj, MesonInterpreterObject):