STY: pyupgrade --py38-plus

Author: effigies

nitransforms/cli.py

@@ -45,7 +45,7 @@ def cli_apply(pargs):
         cval=pargs.cval,
         prefilter=pargs.prefilter,
     )
-    moved.to_filename(pargs.out or "nt_{}".format(os.path.basename(pargs.moving)))
+    moved.to_filename(pargs.out or f"nt_{os.path.basename(pargs.moving)}")
 
 
 def get_parser():

nitransforms/io/lta.py

@@ -176,7 +176,7 @@ def set_type(self, new_type):
             return
 
         raise NotImplementedError(
-            "Converting {0} to {1} is not yet available".format(
+            "Converting {} to {} is not yet available".format(
                 transform_codes.label[current], transform_codes.label[new_type]
             )
         )
@@ -334,7 +334,7 @@ def to_string(self):
         code = int(self["type"])
         header = [
             "# LTA-array file created by NiTransforms",
-            "type      = {} # {}".format(code, transform_codes.label[code]),
+            f"type      = {code} # {transform_codes.label[code]}",
             "nxforms   = {}".format(self["nxforms"]),
         ]
         xforms = [xfm.to_string(partial=True) for xfm in self._xforms]

nitransforms/nonlinear.py

@@ -241,7 +241,7 @@ class BSplineFieldTransform(TransformBase):
 
     def __init__(self, coefficients, reference=None, order=3):
         """Create a smooth deformation field using B-Spline basis."""
-        super(BSplineFieldTransform, self).__init__()
+        super().__init__()
         self._order = order
 
         coefficients = _ensure_image(coefficients)

nitransforms/tests/test_io.py

@@ -204,7 +204,7 @@ def test_Linear_common(tmpdir, data_path, sw, image_orientation, get_testdata):
     with pytest.raises(TransformFileError):
         factory.from_string("")
 
-    fname = "affine-%s.%s%s" % (image_orientation, sw, ext)
+    fname = f"affine-{image_orientation}.{sw}{ext}"
 
     # Test the transform loaders are implemented
     xfm = factory.from_filename(data_path / fname)
@@ -262,7 +262,7 @@ def test_LinearList_common(tmpdir, data_path, sw, image_orientation, get_testdat
 
     tflist1 = factory(mats)
 
-    fname = "affine-%s.%s%s" % (image_orientation, sw, ext)
+    fname = f"affine-{image_orientation}.{sw}{ext}"
 
     with pytest.raises(FileNotFoundError):
         factory.from_filename(fname)
@@ -305,7 +305,7 @@ def test_ITKLinearTransform(tmpdir, testdata_path):
 
     # Test to_filename(textfiles)
     itkxfm.to_filename("textfile.tfm")
-    with open("textfile.tfm", "r") as f:
+    with open("textfile.tfm") as f:
         itkxfm2 = itk.ITKLinearTransform.from_fileobj(f)
     assert np.allclose(itkxfm["parameters"], itkxfm2["parameters"])
 

nitransforms/tests/test_linear.py

@@ -226,7 +226,7 @@ def test_linear_save(tmpdir, data_path, get_testdata, image_orientation, sw_tool
     elif sw_tool == "fs":
         ext = ".lta"
 
-    xfm_fname1 = "M.%s%s" % (sw_tool, ext)
+    xfm_fname1 = f"M.{sw_tool}{ext}"
     xfm.to_filename(xfm_fname1, fmt=sw_tool)
 
     xfm_fname2 = str(data_path / "affine-%s.%s%s") % (image_orientation, sw_tool, ext)
@@ -257,7 +257,7 @@ def test_apply_linear_transform(tmpdir, get_testdata, get_testmask, image_orient
     msk.to_filename("mask.nii.gz")
 
     # Write out transform file (software-dependent)
-    xfm_fname = "M.%s%s" % (sw_tool, ext)
+    xfm_fname = f"M.{sw_tool}{ext}"
     # Change reference dataset for AFNI & oblique
     if (sw_tool, image_orientation) == ("afni", "oblique"):
         io.afni.AFNILinearTransform.from_ras(
@@ -278,7 +278,7 @@ def test_apply_linear_transform(tmpdir, get_testdata, get_testmask, image_orient
     # skip test if command is not available on host
     exe = cmd.split(" ", 1)[0]
     if not shutil.which(exe):
-        pytest.skip("Command {} not found on host".format(exe))
+        pytest.skip(f"Command {exe} not found on host")
 
     # resample mask
     exit_code = check_call([cmd], shell=True)

nitransforms/tests/test_nonlinear.py

@@ -158,7 +158,7 @@ def test_displacements_field1(
     # skip test if command is not available on host
     exe = cmd.split(" ", 1)[0]
     if not shutil.which(exe):
-        pytest.skip("Command {} not found on host".format(exe))
+        pytest.skip(f"Command {exe} not found on host")
 
     # resample mask
     exit_code = check_call([cmd], shell=True)
@@ -219,7 +219,7 @@ def test_displacements_field2(tmp_path, testdata_path, sw_tool):
     # skip test if command is not available on host
     exe = cmd.split(" ", 1)[0]
     if not shutil.which(exe):
-        pytest.skip("Command {} not found on host".format(exe))
+        pytest.skip(f"Command {exe} not found on host")
 
     exit_code = check_call([cmd], shell=True)
     assert exit_code == 0