Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Evan Edmond
fslpy
Commits
480bd941
Commit
480bd941
authored
6 years ago
by
Michiel Cottaar
Browse files
Options
Downloads
Patches
Plain Diff
BUG: previous commit was a mistake
reverting back
parent
6e18fcee
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
fsl/utils/filetree/filetree.py
+2
-3
2 additions, 3 deletions
fsl/utils/filetree/filetree.py
with
2 additions
and
3 deletions
fsl/utils/filetree/filetree.py
+
2
−
3
View file @
480bd941
...
@@ -48,11 +48,10 @@ class FileTree(object):
...
@@ -48,11 +48,10 @@ class FileTree(object):
"""
"""
All tree variables including those from the parent tree
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
:
if
self
.
parent
is
None
:
return
without_none
return
self
.
variables
res
=
self
.
parent
.
all_variables
res
=
self
.
parent
.
all_variables
res
.
update
(
without_none
)
res
.
update
(
self
.
variables
)
return
res
return
res
def
get_variable
(
self
,
name
:
str
)
->
str
:
def
get_variable
(
self
,
name
:
str
)
->
str
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment