aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreterbase/_unholder.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-09-01 23:18:28 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-09-25 12:44:11 +0200
commitd93d01b6c5c98a77e057b914e8d66b01d2a10771 (patch)
treeca759dff3424ad09519fada202bbbbe4ad9eaf14 /mesonbuild/interpreterbase/_unholder.py
parent5fcb0e6525e2044e0f82bda488a51350e0f7f29f (diff)
downloadmeson-d93d01b6c5c98a77e057b914e8d66b01d2a10771.zip
meson-d93d01b6c5c98a77e057b914e8d66b01d2a10771.tar.gz
meson-d93d01b6c5c98a77e057b914e8d66b01d2a10771.tar.bz2
interpreter: Introduce StringHolder
Another commit in my quest to rid InterpreterBase from all higher level object processing logic. Additionally, there is a a logic change here, since `str.join` now uses varargs and can now accept more than one argument (and supports list flattening).
Diffstat (limited to 'mesonbuild/interpreterbase/_unholder.py')
-rw-r--r--mesonbuild/interpreterbase/_unholder.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/mesonbuild/interpreterbase/_unholder.py b/mesonbuild/interpreterbase/_unholder.py
index 202f53b..221c52c 100644
--- a/mesonbuild/interpreterbase/_unholder.py
+++ b/mesonbuild/interpreterbase/_unholder.py
@@ -19,9 +19,7 @@ from ..mesonlib import HoldableObject, MesonBugException
import typing as T
def _unholder(obj: T.Union[TYPE_var, InterpreterObject]) -> TYPE_var:
- if isinstance(obj, str):
- return obj
- elif isinstance(obj, list):
+ 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()}