Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d52a62d

Browse files
Merge pull request #3647 from DimitriPapadopoulos/UP
STY: Apply ruff/pyupgrade rules
2 parents a17de8e + dea4116 commit d52a62d

File tree

6 files changed

+10
-32
lines changed

6 files changed

+10
-32
lines changed

‎nipype/external/fsl_imglob.py

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ def main():
9191
if len(sys.argv) <= 1:
9292
usage()
9393

94-
if sys.version_info < (2, 4):
95-
import sets
96-
from sets import Set
97-
98-
setAvailable = False
99-
else:
100-
setAvailable = True
101-
10294
deleteExtensions = True
10395
primaryExtensions = [".nii.gz", ".nii", ".hdr.gz", ".hdr"]
10496
secondaryExtensions = [".img.gz", ".img"]
@@ -131,18 +123,10 @@ def main():
131123
)
132124

133125
if deleteExtensions:
134-
for file in range(0, len(filelist)):
135-
filelist[file] = removeImageExtension(filelist[file], allExtensions)
136-
if setAvailable:
137-
filelist = list(set(filelist))
138-
else:
139-
filelist = list(Set(filelist))
140-
filelist.sort()
126+
filelist = [removeImageExtension(f, allExtensions) for f in filelist]
127+
filelist = sorted(set(filelist))
141128

142-
for file in range(0, len(filelist)):
143-
print(filelist[file], end=" ")
144-
if file < len(filelist) - 1:
145-
print(" ", end=" ")
129+
print(*filelist, sep=" ", end=" ")
146130

147131

148132
if __name__ == "__main__":

‎nipype/interfaces/io.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def copytree(src, dst, use_hardlink=False):
8484
hashmethod="content",
8585
use_hardlink=use_hardlink,
8686
)
87-
except (OSError, os.error) as why:
87+
except OSError as why:
8888
errors.append((srcname, dstname, str(why)))
8989
# catch the Error from the recursive copytree so that we can
9090
# continue with other files

‎nipype/pipeline/engine/workflows.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ def disconnect(self, *args):
289289
for srcnode, dstnode, conn in connection_list:
290290
logger.debug("disconnect(): %s->%s %s", srcnode, dstnode, str(conn))
291291
if self in [srcnode, dstnode]:
292-
raise IOError(
292+
raise OSError(
293293
"Workflow connect cannot contain itself as node: src[%s] "
294294
"dest[%s] workflow[%s]"
295295
) % (srcnode, dstnode, self.name)

‎nipype/pipeline/plugins/sge.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,8 @@ def is_job_state_pending(self):
9191
# if initializing for more than 5 minute, failure due to
9292
# initialization and completion before registration
9393
sge_debug_print(
94-
"FAILURE! QJobInfo.IsPending found long running at {1} seconds"
95-
"'initializing' returning False for to break loop!\n{0}".format(
96-
self, time_diff
97-
)
94+
f"FAILURE! QJobInfo.IsPending found long running at {time_diff} seconds "
95+
f"'initializing' returning False for to break loop!\n{self}"
9896
)
9997
is_pending_status = True # Job initialization took too long, so report!
10098
else: # self.is_running() || self.is_pending():
@@ -227,7 +225,7 @@ def _parse_qstat_job_list(self, xml_job_list):
227225
time.mktime(time.strptime(job_time_text, "%Y-%m-%dT%H:%M:%S"))
228226
)
229227
except:
230-
job_time = float(0.0)
228+
job_time = 0.0
231229
# Make job entry
232230

233231
task_id = int(job_num)

‎nipype/pipeline/plugins/sgegraph.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ def make_job_name(jobnumber, nodeslist):
130130
not self._dont_resubmit_completed_jobs
131131
or not cache_doneness_per_node[jobid]
132132
):
133-
values += "${{{0}}},".format(
134-
make_job_name(jobid, nodes)
135-
)
133+
values += f"${{{make_job_name(jobid, nodes)}}},"
136134
if (
137135
values != " "
138136
): # i.e. if some jobs were added to dependency list

‎nipype/pipeline/plugins/slurmgraph.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ def make_job_name(jobnumber, nodeslist):
130130
not self._dont_resubmit_completed_jobs
131131
or not cache_doneness_per_node[jobid]
132132
):
133-
values += "${{{0}}}:".format(
134-
make_job_name(jobid, nodes)
135-
)
133+
values += f"${{{make_job_name(jobid, nodes)}}}:"
136134
if (
137135
values != ""
138136
): # i.e. if some jobs were added to dependency list

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /