From 480bd94141bc8b2abe0cdf261af75458a249a3e5 Mon Sep 17 00:00:00 2001 From: Michiel Cottaar <MichielCottaar@gmail.com> Date: Wed, 10 Oct 2018 14:10:18 +0100 Subject: [PATCH] BUG: previous commit was a mistake reverting back --- fsl/utils/filetree/filetree.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fsl/utils/filetree/filetree.py b/fsl/utils/filetree/filetree.py index edcccc9fb..b231da407 100644 --- a/fsl/utils/filetree/filetree.py +++ b/fsl/utils/filetree/filetree.py @@ -48,11 +48,10 @@ class FileTree(object): """ All tree variables including those from the parent tree """ - without_none = {key: value for key, value in self.variables.items() if value is not None} if self.parent is None: - return without_none + return self.variables res = self.parent.all_variables - res.update(without_none) + res.update(self.variables) return res def get_variable(self, name: str) -> str: -- GitLab