STY: Use f-strings where possible

These have been changed manually.

Author: DimitriPapadopoulos

docs/sphinxext/docscrape.py

@@ -326,8 +326,9 @@ def parse_item_name(text):
                 description = line_match.group("desc")
                 if line_match.group("trailing") and description:
                     self._error_location(
-                        "Unexpected comma or period after function list at index %d of "
-                        'line "%s"' % (line_match.end("trailing"), line),
+                        "Unexpected comma or period after function list "
+                        f"at index {line_match.end('trailing')} of line "
+                        f'"{line}"',
                         error=False,
                     )
             if not description and line.startswith(" "):
@@ -414,8 +415,8 @@ def _parse(self):
                 section = " ".join(section)
                 if self.get(section):
                     self._error_location(
-                        "The section %s appears twice in  %s"
-                        % (section, "\n".join(self._doc._str))
+                        f"The section {section} appears twice "
+                        f"in  {'\n'.join(self._doc._str)}"
                     )
 
             if section in ("Parameters", "Other Parameters", "Attributes", "Methods"):

docs/sphinxext/github.py

@@ -37,7 +37,7 @@ def make_link_node(rawtext, app, type, slug, options):
         if not base.endswith('/'):
             base += '/'
     except AttributeError as err:
-        raise ValueError('github_project_url configuration value is not set (%s)' % str(err))
+        raise ValueError(f'github_project_url configuration value is not set ({err})')
 
     ref = base + type + '/' + slug + '/'
     set_classes(options)
@@ -71,19 +71,19 @@ def ghissue_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     except ValueError:
         msg = inliner.reporter.error(
             'GitHub issue number must be a number greater than or equal to 1; '
-            '"%s" is invalid.' % text, line=lineno)
+            f'"{text}" is invalid.', line=lineno)
         prb = inliner.problematic(rawtext, rawtext, msg)
         return [prb], [msg]
     app = inliner.document.settings.env.app
-    #app.info('issue %r' % text)
+    #app.info(f'issue {text!r}')
     if 'pull' in name.lower():
         category = 'pull'
     elif 'issue' in name.lower():
         category = 'issues'
     else:
         msg = inliner.reporter.error(
             'GitHub roles include "ghpull" and "ghissue", '
-            '"%s" is invalid.' % name, line=lineno)
+            f'"{name}" is invalid.', line=lineno)
         prb = inliner.problematic(rawtext, rawtext, msg)
         return [prb], [msg]
     node = make_link_node(rawtext, app, category, str(issue_num), options)
@@ -105,7 +105,7 @@ def ghuser_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     :param content: The directive content for customization.
     """
     app = inliner.document.settings.env.app
-    #app.info('user link %r' % text)
+    #app.info(f'user link {text!r}')
     ref = 'https://www.github.com/' + text
     node = nodes.reference(rawtext, text, refuri=ref, **options)
     return [node], []
@@ -126,15 +126,15 @@ def ghcommit_role(name, rawtext, text, lineno, inliner, options={}, content=[]):
     :param content: The directive content for customization.
     """
     app = inliner.document.settings.env.app
-    #app.info('user link %r' % text)
+    #app.info(f'user link {text!r}')
     try:
         base = app.config.github_project_url
         if not base:
             raise AttributeError
         if not base.endswith('/'):
             base += '/'
     except AttributeError as err:
-        raise ValueError('github_project_url configuration value is not set (%s)' % str(err))
+        raise ValueError(f'github_project_url configuration value is not set ({err})')
 
     ref = base + text
     node = nodes.reference(rawtext, text[:6], refuri=ref, **options)

docs/sphinxext/math_dollar.py

@@ -33,7 +33,7 @@ def dollars_to_math(source):
     def repl(matchobj):
         global _data
         s = matchobj.group(0)
-        t = "___XXX_REPL_%d___" % len(_data)
+        t = f"___XXX_REPL_{len(_data)}___"
         _data[t] = s
         return t
     s = re.sub(r"({[^{}$]*\$[^{}$]*\$[^{}]*})", repl, s)

niworkflows/__about__.py

@@ -29,9 +29,7 @@
 from datetime import datetime
 
 __packagename__ = "niworkflows"
-__copyright__ = "Copyright {}, The NiPreps Developers".format(
-    datetime.now().year
-)
+__copyright__ = f"Copyright {datetime.now().year}, The NiPreps Developers"
 __credits__ = [
     "Oscar Esteban",
     "Ross Blair",

niworkflows/anat/ants.py

@@ -721,19 +721,19 @@ def init_atropos_wf(
 
     # De-pad
     depad_mask = pe.Node(
-        ImageMath(operation="PadImage", op2="-%d" % padding), name="23_depad_mask"
+        ImageMath(operation="PadImage", op2=f"-{padding}"), name="23_depad_mask"
     )
     depad_segm = pe.Node(
-        ImageMath(operation="PadImage", op2="-%d" % padding), name="24_depad_segm"
+        ImageMath(operation="PadImage", op2=f"-{padding}"), name="24_depad_segm"
     )
     depad_gm = pe.Node(
-        ImageMath(operation="PadImage", op2="-%d" % padding), name="25_depad_gm"
+        ImageMath(operation="PadImage", op2=f"-{padding}"), name="25_depad_gm"
     )
     depad_wm = pe.Node(
-        ImageMath(operation="PadImage", op2="-%d" % padding), name="26_depad_wm"
+        ImageMath(operation="PadImage", op2=f"-{padding}"), name="26_depad_wm"
     )
     depad_csf = pe.Node(
-        ImageMath(operation="PadImage", op2="-%d" % padding), name="27_depad_csf"
+        ImageMath(operation="PadImage", op2=f"-{padding}"), name="27_depad_csf"
     )
 
     msk_conform = pe.Node(niu.Function(function=_conform_mask), name="msk_conform")
@@ -1061,7 +1061,7 @@ def _select_labels(in_segm, labels):
     for label in labels:
         newnii = nii.__class__(np.uint8(label_data == label), nii.affine, nii.header)
         newnii.set_data_dtype("uint8")
-        out_file = fname_presuffix(in_segm, suffix="_class-%02d" % label, newpath=cwd)
+        out_file = fname_presuffix(in_segm, suffix=f"_class-{label:%02d}", newpath=cwd)
         newnii.to_filename(out_file)
         out_files.append(out_file)
     return out_files

niworkflows/data/__init__.py

@@ -110,7 +110,7 @@ class Loader:
     .. automethod:: cached
     """
 
-    def __init__(self, anchor: Union[str, ModuleType]):
+    def __init__(self, anchor: str | ModuleType):
         self._anchor = anchor
         self.files = files(anchor)
         self.exit_stack = ExitStack()

niworkflows/func/tests/test_util.py

@@ -85,11 +85,10 @@
     parameters = zip(bold_datasets, exp_masks)
 
     if not bold_datasets:
+        _folder_contents = "\n".join([str(p) for p in datapath.glob("ds*/*.nii.gz")])
         raise RuntimeError(
             f"Data folder <{datapath}> was provided, but no images were found. "
-            "Folder contents:\n{}".format(
-                "\n".join([str(p) for p in datapath.glob("ds*/*.nii.gz")])
-            )
+            f"Folder contents:\n{_folder_contents}"
         )
 
 

niworkflows/interfaces/bids.py

@@ -857,8 +857,7 @@ def _run_interface(self, runtime):
         for fname in self._fields:
             if not self._undef_fields and fname not in metadata:
                 raise KeyError(
-                    'Metadata field "%s" not found for file %s'
-                    % (fname, self.inputs.in_file)
+                    f'Metadata field "{fname}" not found for file {self.inputs.in_file}'
                 )
             self._results[fname] = metadata.get(fname, Undefined)
         return runtime
@@ -944,7 +943,7 @@ def _run_interface(self, runtime):
                 if dest.exists():
                     continue
                 else:
-                    raise FileNotFoundError("Expected to find '%s' to copy" % source)
+                    raise FileNotFoundError(f"Expected to find '{source}' to copy")
 
             if (
                 space == 'fsaverage'

niworkflows/interfaces/confounds.py

@@ -298,13 +298,13 @@ def spike_regressors(
     mask = reduce((lambda x, y: x | y), mask.values())
 
     for lag in lags:
-        mask = set([m + lag for m in mask]) | mask
+        mask = {m + lag for m in mask} | mask
 
     mask = mask.intersection(indices)
     if minimum_contiguous is not None:
         post_final = data.shape[0] + 1
-        epoch_length = np.diff(sorted(mask | set([-1, post_final]))) - 1
-        epoch_end = sorted(mask | set([post_final]))
+        epoch_length = np.diff(sorted(mask | {-1, post_final})) - 1
+        epoch_end = sorted(mask | {post_final})
         for end, length in zip(epoch_end, epoch_length):
             if length < minimum_contiguous:
                 mask = mask | set(range(end - length, end))
@@ -357,7 +357,7 @@ def temporal_derivatives(order, variables, data):
     if 0 in order:
         data_deriv[0] = data[variables]
         variables_deriv[0] = variables
-        order = set(order) - set([0])
+        order = set(order) - {0}
     for o in order:
         variables_deriv[o] = [f"{v}_derivative{o}" for v in variables]
         data_deriv[o] = np.tile(np.nan, data[variables].shape)
@@ -400,7 +400,7 @@ def exponential_terms(order, variables, data):
     if 1 in order:
         data_exp[1] = data[variables]
         variables_exp[1] = variables
-        order = set(order) - set([1])
+        order = set(order) - {1}
     for o in order:
         variables_exp[o] = [f"{v}_power{o}" for v in variables]
         data_exp[o] = data[variables] ** o

niworkflows/interfaces/freesurfer.py

@@ -139,7 +139,7 @@ def cmdline(self):
         if source is None:
             return cmd
 
-        return "cp {} {}".format(source, self._list_outputs()["out_file"])
+        return f"cp {source} {self._list_outputs()['out_file']}"
 
 
 class _FSInjectBrainExtractedInputSpec(BaseInterfaceInputSpec):