aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-03-07 09:54:28 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-15 11:41:49 +0100
commit66db1af4dd4905426cc7e11e335e1e4788d267d4 (patch)
tree6fb189651de722313525334ed9037a297bccc5fc
parent33af33594943c066ff269d5144017e7b5e558fd5 (diff)
downloadmeson-66db1af4dd4905426cc7e11e335e1e4788d267d4.zip
meson-66db1af4dd4905426cc7e11e335e1e4788d267d4.tar.gz
meson-66db1af4dd4905426cc7e11e335e1e4788d267d4.tar.bz2
interpreter: allow passing dictionaries to holderify
This in turn allows modules to return dictionaries, since their return values is automatically passed through holderify.
-rw-r--r--mesonbuild/interpreter.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 3c3cfae..ca4414a 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -2119,6 +2119,9 @@ class Interpreter(InterpreterBase):
def holderify(self, item):
if isinstance(item, list):
return [self.holderify(x) for x in item]
+ if isinstance(item, dict):
+ return {k: self.holderify(v) for k, v in item.items()}
+
if isinstance(item, build.CustomTarget):
return CustomTargetHolder(item, self)
elif isinstance(item, (int, str, bool)) or item is None: