Skip to content

Commit 60aa048

Browse files
STY: Further simplification
Co-authored-by: Chris Markiewicz <effigies@gmail.com>
1 parent df2b0b7 commit 60aa048

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

nipype/pipeline/engine/utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,10 +1489,9 @@ def clean_working_directory(
14891489
files2remove.append(f)
14901490
else:
14911491
if not str2bool(config["execution"]["keep_inputs"]):
1492-
input_files = []
1493-
inputdict = inputs.trait_get()
1494-
input_files.extend(walk_outputs(inputdict))
1495-
input_files = [path for path, type in input_files if type == "f"]
1492+
input_files = {
1493+
path for path, type in walk_outputs(inputs.trait_get()) if type == "f"
1494+
}
14961495
files2remove.extend(
14971496
f for f in walk_files(cwd) if f in input_files and f not in needed_files
14981497
)

nipype/utils/filemanip.py

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -444,16 +444,15 @@ def get_related_files(filename, include_this_file=True):
444444
include_this_file : bool
445445
If true, output includes the input filename.
446446
"""
447-
related_files = []
448447
path, name, this_type = split_filename(filename)
449-
for type_set in related_filetype_sets:
450-
if this_type in type_set:
451-
related_files.extend(
452-
op.join(path, name + related_type)
453-
for related_type in type_set
454-
if include_this_file or related_type != this_type
455-
)
456-
if not len(related_files):
448+
related_files = [
449+
op.join(path, f"{name}{related_type}")
450+
for type_set in related_filetype_sets
451+
if this_type in type_set
452+
for related_type in type_set
453+
if include_this_file or related_type != this_type
454+
]
455+
if not related_files:
457456
related_files = [filename]
458457
return related_files
459458

@@ -715,13 +714,11 @@ def write_rst_header(header, level=0):
715714

716715

717716
def write_rst_list(items, prefix=""):
718-
out = [f"{prefix} {item}" for item in ensure_list(items)]
719-
return "\n".join(out) + "\n\n"
717+
return "\n".join(f"{prefix} {item}" for item in ensure_list(items)) + "\n\n"
720718

721719

722720
def write_rst_dict(info, prefix=""):
723-
out = [f"{prefix}* {key} : {value}" for key, value in sorted(info.items())]
724-
return "\n".join(out) + "\n\n"
721+
return "\n".join(f"{prefix}* {k} : {v}" for k, v in sorted(info.items())) + "\n\n"
725722

726723

727724
def dist_is_editable(dist):

nipype/utils/nipype2boutiques.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ def get_boutiques_output(outputs, name, spec, interface, tool_inputs):
477477
# If extensions all the same, set path template as
478478
# wildcard + extension. Otherwise just use a wildcard
479479
if len(extensions) == 1:
480-
output["path-template"] = "*" + extensions[0]
480+
output["path-template"] = "*" + extensions.pop()
481481
else:
482482
output["path-template"] = "*"
483483
return output

0 commit comments

Comments
 (0)