Skip to content

Commit 4b28a11

Browse files
DimitriPapadopoulosDimitriPapadopoulos
committed
STY: Apply ruff rule RUF019
RUF019 Unnecessary key check before dictionary access
1 parent d99f3bc commit 4b28a11

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

‎nipype/pipeline/plugins/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ def _get_args(self, node, keywords):
618618
else:
619619
tmp_value = node.plugin_args[keyword]
620620

621-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
621+
if node.plugin_args.get("overwrite"):
622622
value = tmp_value
623623
else:
624624
value += tmp_value

‎nipype/pipeline/plugins/condor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, **kwargs):
3838
"""
3939
self._retry_timeout = 2
4040
self._max_tries = 2
41-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
41+
if kwargs.get("plugin_args"):
4242
if "retry_timeout" in kwargs["plugin_args"]:
4343
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4444
if "max_tries" in kwargs["plugin_args"]:
@@ -71,7 +71,7 @@ def _submit_batchtask(self, scriptfile, node):
7171
if self._qsub_args:
7272
qsubargs = self._qsub_args
7373
if "qsub_args" in node.plugin_args:
74-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
74+
if node.plugin_args.get("overwrite"):
7575
qsubargs = node.plugin_args["qsub_args"]
7676
else:
7777
qsubargs += " " + node.plugin_args["qsub_args"]

‎nipype/pipeline/plugins/lsf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(self, **kwargs):
3131
self._retry_timeout = 2
3232
self._max_tries = 2
3333
self._bsub_args = ""
34-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
34+
if kwargs.get("plugin_args"):
3535
if "retry_timeout" in kwargs["plugin_args"]:
3636
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
3737
if "max_tries" in kwargs["plugin_args"]:
@@ -70,7 +70,7 @@ def _submit_batchtask(self, scriptfile, node):
7070
if self._bsub_args:
7171
bsubargs = self._bsub_args
7272
if "bsub_args" in node.plugin_args:
73-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
73+
if node.plugin_args.get("overwrite"):
7474
bsubargs = node.plugin_args["bsub_args"]
7575
else:
7676
bsubargs += " " + node.plugin_args["bsub_args"]

‎nipype/pipeline/plugins/oar.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def __init__(self, **kwargs):
3838
self._retry_timeout = 2
3939
self._max_tries = 2
4040
self._max_jobname_length = 15
41-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
41+
if kwargs.get("plugin_args"):
4242
if "oarsub_args" in kwargs["plugin_args"]:
4343
self._oarsub_args = kwargs["plugin_args"]["oarsub_args"]
4444
if "retry_timeout" in kwargs["plugin_args"]:
@@ -75,7 +75,7 @@ def _submit_batchtask(self, scriptfile, node):
7575
if self._oarsub_args:
7676
oarsubargs = self._oarsub_args
7777
if "oarsub_args" in node.plugin_args:
78-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
78+
if node.plugin_args.get("overwrite"):
7979
oarsubargs = node.plugin_args["oarsub_args"]
8080
else:
8181
oarsubargs += " " + node.plugin_args["oarsub_args"]

‎nipype/pipeline/plugins/pbs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def __init__(self, **kwargs):
3434
self._retry_timeout = 2
3535
self._max_tries = 2
3636
self._max_jobname_length = 15
37-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
37+
if kwargs.get("plugin_args"):
3838
if "retry_timeout" in kwargs["plugin_args"]:
3939
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4040
if "max_tries" in kwargs["plugin_args"]:
@@ -73,7 +73,7 @@ def _submit_batchtask(self, scriptfile, node):
7373
if self._qsub_args:
7474
qsubargs = self._qsub_args
7575
if "qsub_args" in node.plugin_args:
76-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
76+
if node.plugin_args.get("overwrite"):
7777
qsubargs = node.plugin_args["qsub_args"]
7878
else:
7979
qsubargs += " " + node.plugin_args["qsub_args"]

‎nipype/pipeline/plugins/sge.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ def __init__(self, **kwargs):
400400
instant_qstat = "qstat"
401401
cached_qstat = "qstat"
402402

403-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
403+
if kwargs.get("plugin_args"):
404404
if "retry_timeout" in kwargs["plugin_args"]:
405405
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
406406
if "max_tries" in kwargs["plugin_args"]:
@@ -428,7 +428,7 @@ def _submit_batchtask(self, scriptfile, node):
428428
if self._qsub_args:
429429
qsubargs = self._qsub_args
430430
if "qsub_args" in node.plugin_args:
431-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
431+
if node.plugin_args.get("overwrite"):
432432
qsubargs = node.plugin_args["qsub_args"]
433433
else:
434434
qsubargs += " " + node.plugin_args["qsub_args"]

‎nipype/pipeline/plugins/sgegraph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class SGEGraphPlugin(GraphPluginBase):
4747
def __init__(self, **kwargs):
4848
self._qsub_args = ""
4949
self._dont_resubmit_completed_jobs = False
50-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
50+
if kwargs.get("plugin_args"):
5151
plugin_args = kwargs["plugin_args"]
5252
if "template" in plugin_args:
5353
self._template = plugin_args["template"]

‎nipype/pipeline/plugins/slurm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def __init__(self, **kwargs):
4040
self._sbatch_args = None
4141
self._jobid_re = "Submitted batch job ([0-9]*)"
4242

43-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
43+
if kwargs.get("plugin_args"):
4444
if "retry_timeout" in kwargs["plugin_args"]:
4545
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4646
if "max_tries" in kwargs["plugin_args"]:
@@ -100,7 +100,7 @@ def _submit_batchtask(self, scriptfile, node):
100100
if self._sbatch_args:
101101
sbatch_args = self._sbatch_args
102102
if "sbatch_args" in node.plugin_args:
103-
if "overwrite" in node.plugin_args and node.plugin_args["overwrite"]:
103+
if node.plugin_args.get("overwrite"):
104104
sbatch_args = node.plugin_args["sbatch_args"]
105105
else:
106106
sbatch_args += " " + node.plugin_args["sbatch_args"]

‎nipype/pipeline/plugins/slurmgraph.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class SLURMGraphPlugin(GraphPluginBase):
4242

4343
def __init__(self, **kwargs):
4444
self._sbatch_args = ""
45-
if "plugin_args" in kwargs and kwargs["plugin_args"]:
45+
if kwargs.get("plugin_args"):
4646
if "retry_timeout" in kwargs["plugin_args"]:
4747
self._retry_timeout = kwargs["plugin_args"]["retry_timeout"]
4848
if "max_tries" in kwargs["plugin_args"]:

0 commit comments

Comments
 (0)