More f-strings

flynt -ll 999 .
All changes were reviewed manually
(Excluding versioneer)

Author: jond01

nibabel/cifti2/cifti2_axes.py

@@ -320,8 +320,8 @@ def __init__(self, name, voxel=None, vertex=None, affine=None,
         for check_name in ('name', 'voxel', 'vertex'):
             shape = (self.size, 3) if check_name == 'voxel' else (self.size, )
             if getattr(self, check_name).shape != shape:
-                raise ValueError("Input {} has incorrect shape ({}) for BrainModelAxis axis".format(
-                        check_name, getattr(self, check_name).shape))
+                raise ValueError(f"Input {check_name} has incorrect shape "
+                                 f"({getattr(self, check_name).shape}) for BrainModelAxis axis")
 
     @classmethod
     def from_mask(cls, mask, name='other', affine=None):
@@ -537,8 +537,8 @@ def to_cifti_brain_structure_name(name):
         else:
             proposed_name = f'CIFTI_STRUCTURE_{structure.upper()}_{orientation.upper()}'
         if proposed_name not in cifti2.CIFTI_BRAIN_STRUCTURES:
-            raise ValueError('%s was interpreted as %s, which is not a valid CIFTI brain structure'
-                             % (name, proposed_name))
+            raise ValueError(f'{name} was interpreted as {proposed_name}, which is not '
+                             f'a valid CIFTI brain structure')
         return proposed_name
 
     @property
@@ -650,8 +650,8 @@ def __add__(self, other):
         nvertices = dict(self.nvertices)
         for name, value in other.nvertices.items():
             if name in nvertices.keys() and nvertices[name] != value:
-                raise ValueError("Trying to concatenate two BrainModels with inconsistent "
-                                 "number of vertices for %s" % name)
+                raise ValueError(f"Trying to concatenate two BrainModels with "
+                                 f"inconsistent number of vertices for {name}")
             nvertices[name] = value
         return self.__class__(
                 np.append(self.name, other.name),
@@ -763,8 +763,8 @@ def __init__(self, name, voxels, vertices, affine=None, volume_shape=None, nvert
 
         for check_name in ('name', 'voxels', 'vertices'):
             if getattr(self, check_name).shape != (self.size, ):
-                raise ValueError("Input {} has incorrect shape ({}) for Parcel axis".format(
-                        check_name, getattr(self, check_name).shape))
+                raise ValueError(f"Input {check_name} has incorrect shape "
+                                 f"({getattr(self, check_name).shape}) for Parcel axis")
 
     @classmethod
     def from_brain_models(cls, named_brain_models):
@@ -804,8 +804,8 @@ def from_brain_models(cls, named_brain_models):
             for name, _, bm_part in bm.iter_structures():
                 if name in bm.nvertices.keys():
                     if name in nvertices.keys() and nvertices[name] != bm.nvertices[name]:
-                        raise ValueError("Got multiple conflicting number of "
-                                         "vertices for surface structure %s" % name)
+                        raise ValueError(f"Got multiple conflicting number of "
+                                         f"vertices for surface structure {name}")
                     nvertices[name] = bm.nvertices[name]
                     vertices[name] = bm_part.vertex
             all_vertices[idx_parcel] = vertices
@@ -846,8 +846,7 @@ def from_index_mapping(cls, mim):
                 name = vertex.brain_structure
                 vertices[vertex.brain_structure] = np.array(vertex)
                 if name not in nvertices.keys():
-                    raise ValueError("Number of vertices for surface structure %s not defined" %
-                                     name)
+                    raise ValueError(f"Number of vertices for surface structure {name} not defined")
             all_voxels[idx_parcel] = voxels
             all_vertices[idx_parcel] = vertices
             all_names.append(parcel.name)
@@ -968,9 +967,8 @@ def __add__(self, other):
         nvertices = dict(self.nvertices)
         for name, value in other.nvertices.items():
             if name in nvertices.keys() and nvertices[name] != value:
-                raise ValueError("Trying to concatenate two ParcelsAxis with inconsistent "
-                                 "number of vertices for %s"
-                                 % name)
+                raise ValueError(f"Trying to concatenate two ParcelsAxis with "
+                                 f"inconsistent number of vertices for {name}")
             nvertices[name] = value
         return self.__class__(
                 np.append(self.name, other.name),
@@ -1042,8 +1040,8 @@ def __init__(self, name, meta=None):
 
         for check_name in ('name', 'meta'):
             if getattr(self, check_name).shape != (self.size, ):
-                raise ValueError("Input {} has incorrect shape ({}) for ScalarAxis axis".format(
-                        check_name, getattr(self, check_name).shape))
+                raise ValueError(f"Input {check_name} has incorrect shape "
+                                 f"({getattr(self, check_name).shape}) for ScalarAxis axis")
 
     @classmethod
     def from_index_mapping(cls, mim):
@@ -1176,8 +1174,8 @@ def __init__(self, name, label, meta=None):
 
         for check_name in ('name', 'meta', 'label'):
             if getattr(self, check_name).shape != (self.size, ):
-                raise ValueError("Input {} has incorrect shape ({}) for LabelAxis axis".format(
-                        check_name, getattr(self, check_name).shape))
+                raise ValueError(f"Input {check_name} has incorrect shape "
+                                 f"({getattr(self, check_name).shape}) for LabelAxis axis")
 
     @classmethod
     def from_index_mapping(cls, mim):

nibabel/cmdline/dicomfs.py

@@ -196,8 +196,8 @@ def release(self, path, flags, fh):
 def get_opt_parser():
     # use module docstring for help output
     p = OptionParser(
-        usage="%s [OPTIONS] <DIRECTORY CONTAINING DICOMSs> <mount point>"
-              % os.path.basename(sys.argv[0]),
+        usage=f"{os.path.basename(sys.argv[0])} [OPTIONS] "
+              f"<DIRECTORY CONTAINING DICOMSs> <mount point>",
         version="%prog " + nib.__version__)
 
     p.add_options([

nibabel/cmdline/parrec2nii.py

@@ -158,8 +158,8 @@ def proc_file(infile, opts):
     else:
         outfilename = basefilename + '.nii'
     if os.path.isfile(outfilename) and not opts.overwrite:
-        raise IOError('Output file "%s" exists, use --overwrite to '
-                      'overwrite it' % outfilename)
+        raise IOError(f'Output file "{outfilename}" exists, '
+                      f'use --overwrite to overwrite it')
 
     # load the PAR header and data
     scaling = 'dv' if opts.scaling == 'off' else opts.scaling
@@ -295,8 +295,8 @@ def proc_file(infile, opts):
         except MRIError:
             verbose('No EPI factors, dwell time not written')
         else:
-            verbose('Writing dwell time (%r sec) calculated assuming %sT '
-                    'magnet' % (dwell_time, opts.field_strength))
+            verbose(f'Writing dwell time ({dwell_time!r} sec) '
+                    f'calculated assuming {opts.field_strength}T magnet')
             with open(basefilename + '.dwell_time', 'w') as fid:
                 fid.write(f'{dwell_time!r}\n')
     # done

nibabel/cmdline/tck2trk.py

@@ -41,8 +41,9 @@ def main():
         filename, _ = os.path.splitext(tractogram)
         output_filename = filename + '.trk'
         if os.path.isfile(output_filename) and not args.force:
-            msg = "Skipping existing file: '{}'. Use -f to overwrite."
-            print(msg.format(output_filename))
+            msg = (f"Skipping existing file: '{output_filename}'. "
+                   f"Use -f to overwrite.")
+            print(msg)
             continue
 
         # Build header using infos from the anatomical image.

nibabel/cmdline/tests/test_conform.py

@@ -46,8 +46,8 @@ def test_nondefault(tmpdir):
     out_shape = (100, 100, 150)
     voxel_size = (1, 2, 4)
     orientation = "LAS"
-    args = "{} {} --out-shape {} --voxel-size {} --orientation {}".format(
-        infile, outfile, " ".join(map(str, out_shape)), " ".join(map(str, voxel_size)), orientation)
+    args = (f"{infile} {outfile} --out-shape {' '.join(map(str, out_shape))} "
+            f"--voxel-size {' '.join(map(str, voxel_size))} --orientation {orientation}")
     main(args.split())
     assert outfile.isfile()
     c = nib.load(outfile)

nibabel/cmdline/trk2tck.py

@@ -31,8 +31,9 @@ def main():
         filename, _ = os.path.splitext(tractogram)
         output_filename = filename + '.tck'
         if os.path.isfile(output_filename) and not args.force:
-            msg = "Skipping existing file: '{}'. Use -f to overwrite."
-            print(msg.format(output_filename))
+            msg = (f"Skipping existing file: '{output_filename}'. "
+                   f"Use -f to overwrite.")
+            print(msg)
             continue
 
         trk = nib.streamlines.load(tractogram)

nibabel/data.py

@@ -240,9 +240,8 @@ def find_data_dir(root_dirs, *names):
         pth = pjoin(path, ds_relative)
         if os.path.isdir(pth):
             return pth
-    raise DataError('Could not find datasource "%s" in data path "%s"' %
-                    (ds_relative,
-                     os.path.pathsep.join(root_dirs)))
+    raise DataError(f'Could not find datasource "{ds_relative}" in '
+                    f'data path "{os.path.pathsep.join(root_dirs)}"')
 
 
 def make_datasource(pkg_def, **kwargs):
@@ -313,9 +312,8 @@ def __init__(self, name, msg):
     def __getattr__(self, attr_name):
         """ Raise informative error accessing not-found attributes """
         raise BomberError(
-            'Trying to access attribute "%s" '
-            'of non-existent data "%s"\n\n%s\n' %
-            (attr_name, self.name, self.msg))
+            f'Trying to access attribute "{attr_name}" of '
+            f'non-existent data "{self.name}"\n\n{self.msg}\n')
 
 
 def datasource_or_bomber(pkg_def, **options):
@@ -358,10 +356,6 @@ def datasource_or_bomber(pkg_def, **options):
         pkg_name = pkg_def['name']
     else:
         pkg_name = 'data at ' + unix_relpath
-    msg = ('%(name)s is version %(pkg_version)s but we need '
-           'version >= %(req_version)s\n\n%(pkg_hint)s' %
-           dict(name=pkg_name,
-                pkg_version=ds.version,
-                req_version=version,
-                pkg_hint=pkg_hint))
+    msg = (f"{pkg_name} is version {ds.version} but we need "
+           f"version >= {version}\n\n{pkg_hint}")
     return Bomber(sys_relpath, DataError(msg))

nibabel/deprecator.py

@@ -146,10 +146,8 @@ def __call__(self, message, since='', until='',
         if since:
             messages.append('* deprecated from version: ' + since)
         if until:
-            messages.append('* {0} {1} as of version: {2}'.format(
-                "Raises" if self.is_bad_version(until) else "Will raise",
-                error_class,
-                until))
+            messages.append(f"* {'Raises' if self.is_bad_version(until) else 'Will raise'} "
+                            f"{error_class} as of version: {until}")
         message = '\n'.join(messages)
 
         def deprecator(func):

nibabel/ecat.py

@@ -425,10 +425,8 @@ def get_frame_order(mlist):
     valid_order = np.argsort(ids)
     if not all(valid_order == sorted(valid_order)):
         # raise UserWarning if Frames stored out of order
-        warnings.warn_explicit('Frames stored out of order;'
-                               'true order = %s\n'
-                               'frames will be accessed in order '
-                               'STORED, NOT true order' % valid_order,
+        warnings.warn_explicit(f'Frames stored out of order;true order = {valid_order}\n'
+                               f'frames will be accessed in order STORED, NOT true order',
                                UserWarning, 'ecat', 0)
     id_dict = {}
     for i in range(n_valid):

nibabel/filebasedimages.py

@@ -34,8 +34,8 @@ def from_header(klass, header=None):
         # different field names
         if type(header) == klass:
             return header.copy()
-        raise NotImplementedError("Header class requires a conversion"
-                                  " from %s to %s" % (klass, type(header)))
+        raise NotImplementedError(f"Header class requires a conversion "
+                                  f"from {klass} to {type(header)}")
 
     @classmethod
     def from_fileobj(klass, fileobj):