More f-strings

flynt -ll 999 .
All changes were reviewed manually

Author: jond01

nibabel/_version.py

@@ -125,8 +125,8 @@ def versions_from_parentdir(parentdir_prefix, root, verbose):
             root = os.path.dirname(root)  # up a level
 
     if verbose:
-        print("Tried directories %s but none started with prefix %s" %
-              (str(rootdirs), parentdir_prefix))
+        print(f"Tried directories {str(rootdirs)} but "
+              f"none started with prefix {parentdir_prefix}")
     raise NotThisMethod("rootdir doesn't start with parentdir_prefix")
 
 
@@ -283,17 +283,17 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, run_command=run_command):
         mo = re.search(r'^(.+)-(\d+)-g([0-9a-f]+)$', git_describe)
         if not mo:
             # unparseable. Maybe git-describe is misbehaving?
-            pieces["error"] = (f"unable to parse git-describe output: '{describe_out}'")
+            pieces["error"] = f"unable to parse git-describe output: '{describe_out}'"
             return pieces
 
         # tag
         full_tag = mo.group(1)
         if not full_tag.startswith(tag_prefix):
             if verbose:
-                fmt = "tag '%s' doesn't start with prefix '%s'"
-                print(fmt % (full_tag, tag_prefix))
-            pieces["error"] = ("tag '%s' doesn't start with prefix '%s'"
-                               % (full_tag, tag_prefix))
+                txt = f"tag '{full_tag}' doesn't start with prefix '{tag_prefix}'"
+                print(txt)
+            pieces["error"] = (f"tag '{full_tag}' doesn't start with prefix "
+                               f"'{tag_prefix}'")
             return pieces
         pieces["closest-tag"] = full_tag[len(tag_prefix):]
 

nibabel/analyze.py

@@ -394,11 +394,9 @@ def from_header(klass, header=None, check=True):
         try:
             obj.set_data_dtype(orig_code)
         except HeaderDataError:
-            raise HeaderDataError('Input header %s has datatype %s but '
-                                  'output header %s does not support it'
-                                  % (header.__class__,
-                                     header.get_value_label('datatype'),
-                                     klass))
+            raise HeaderDataError(f"Input header {header.__class__} has "
+                                  f"datatype {header.get_value_label('datatype')} "
+                                  f"but output header {klass} does not support it")
         obj.set_data_dtype(header.get_data_dtype())
         obj.set_data_shape(header.get_data_shape())
         obj.set_zooms(header.get_zooms())

nibabel/arrayproxy.py

@@ -255,8 +255,8 @@ def _should_keep_file_open(self, file_like, keep_file_open):
         if keep_file_open is None:
             keep_file_open = KEEP_FILE_OPEN_DEFAULT
             if keep_file_open not in (True, False):
-                raise ValueError("nibabel.arrayproxy.KEEP_FILE_OPEN_DEFAULT must be boolean. "
-                                 "Found: {}".format(keep_file_open))
+                raise ValueError(f"nibabel.arrayproxy.KEEP_FILE_OPEN_DEFAULT "
+                                 f"must be boolean. Found: {keep_file_open}")
         elif keep_file_open not in (True, False):
             raise ValueError('keep_file_open must be one of {None, True, False}')
 
@@ -412,8 +412,8 @@ def reshape(self, shape):
             shape = tuple(unknown_size if e == -1 else e for e in shape)
 
         if np.prod(shape) != size:
-            raise ValueError("cannot reshape array of size {:d} into shape "
-                             "{!s}".format(size, shape))
+            raise ValueError(f"cannot reshape array of size {size:d} "
+                             f"into shape {shape!s}")
         return self.__class__(file_like=self.file_like,
                               spec=(shape, self._dtype, self._offset,
                                     self._slope, self._inter),

nibabel/benchmarks/bench_arrayproxy_slicing.py

@@ -100,8 +100,8 @@ def fmt_sliceobj(sliceobj):
 
     with InTemporaryDirectory():
 
-        print('Generating test data... ({} MB)'.format(
-            int(round(np.prod(SHAPE) * 4 / 1048576.))))
+        print(f'Generating test data... '
+              f'({int(round(np.prod(SHAPE) * 4 / 1048576.0))} MB)')
 
         data = np.array(np.random.random(SHAPE), dtype=np.float32)
 
@@ -180,8 +180,8 @@ def testfunc():
         data[:, 2] = np.nan
     data[:, 3] = [r[5] - r[6] for r in results]
 
-    rowlbls = ['Type {}, keep_open {}, slice {}'.format(
-        r[0], r[1], fmt_sliceobj(r[2])) for r in results]
+    rowlbls = [(f'Type {r[0]}, keep_open {r[1]}, '
+                f'slice {fmt_sliceobj(r[2])}') for r in results]
     collbls = ['Time', 'Baseline time', 'Time ratio', 'Memory deviation']
 
     print(rst_table(data, rowlbls, collbls))

nibabel/brikhead.py

@@ -114,8 +114,8 @@ def _unpack_var(var):
     TEMPLATE_SPACE ORIG
     """
 
-    err_msg = ('Please check HEAD file to ensure it is AFNI compliant. '
-               'Offending attribute:\n%s' % var)
+    err_msg = (f'Please check HEAD file to ensure it is AFNI compliant. '
+               f'Offending attribute:\n{var}')
     atype, aname = TYPE_RE.findall(var), NAME_RE.findall(var)
     if len(atype) != 1:
         raise AFNIHeaderError(f'Invalid attribute type entry in HEAD file. {err_msg}')
@@ -127,8 +127,8 @@ def _unpack_var(var):
         try:
             attr = [atype(f) for f in attr.split()]
         except ValueError:
-            raise AFNIHeaderError('Failed to read variable from HEAD file due '
-                                  'to improper type casting. %s' % err_msg)
+            raise AFNIHeaderError(f'Failed to read variable from HEAD file '
+                                  f'due to improper type casting. {err_msg}')
     else:
         # AFNI string attributes will always start with open single quote and
         # end with a tilde (NUL). These attributes CANNOT contain tildes (so

nibabel/casting.py

@@ -296,8 +296,8 @@ def type_info(np_type):
                    maxexp=16384,
                    width=width)
     else:  # don't recognize the type
-        raise FloatingError('We had not expected long double type %s '
-                            'with info %s' % (np_type, info))
+        raise FloatingError(f'We had not expected long double '
+                            f'type {np_type} with info {info}')
     return ret
 
 

nibabel/cifti2/cifti2.py

@@ -291,8 +291,8 @@ def _to_xml_element(self):
                 v = _float_01(getattr(self, c_))
             except ValueError:
                 raise Cifti2HeaderError(
-                    'Label invalid %s needs to be a float between 0 and 1. '
-                    'and it is %s' % (c_, v)
+                    f'Label invalid {c_} needs to be a '
+                    f'float between 0 and 1. and it is {v}'
                 )
 
         lab = xml.Element('Label')
@@ -1379,9 +1379,8 @@ def __init__(self,
         self.update_headers()
 
         if self._dataobj.shape != self.header.matrix.get_data_shape():
-            warn("Dataobj shape {} does not match shape expected from CIFTI-2 header {}".format(
-                self._dataobj.shape, self.header.matrix.get_data_shape()
-            ))
+            warn(f"Dataobj shape {self._dataobj.shape} does not match shape "
+                 f"expected from CIFTI-2 header {self.header.matrix.get_data_shape()}")
 
     @property
     def nifti_header(self):
@@ -1459,9 +1458,8 @@ def to_file_map(self, file_map=None):
         header.extensions.append(extension)
         if self._dataobj.shape != self.header.matrix.get_data_shape():
             raise ValueError(
-                "Dataobj shape {} does not match shape expected from CIFTI-2 header {}".format(
-                    self._dataobj.shape, self.header.matrix.get_data_shape()
-                ))
+                f"Dataobj shape {self._dataobj.shape} does not match shape "
+                f"expected from CIFTI-2 header {self.header.matrix.get_data_shape()}")
         # if intent code is not set, default to unknown CIFTI
         if header.get_intent()[0] == 'none':
             header.set_intent('NIFTI_INTENT_CONNECTIVITY_UNKNOWN')

nibabel/spatialimages.py

@@ -516,11 +516,11 @@ def __str__(self):
         shape = self.shape
         affine = self.affine
         return '\n'.join((str(self.__class__),
-                          'data shape %s' % (shape,),
+                          f'data shape {shape}',
                           'affine: ',
-                          '%s' % affine,
+                          f'{affine}',
                           'metadata:',
-                          '%s' % self._header))
+                          f'{self._header}'))
 
     def get_data_dtype(self):
         return self._header.get_data_dtype()

nibabel/tests/test_volumeutils.py

@@ -1224,9 +1224,8 @@ def read(self, n_bytes):
         array_from_file(shape, np.int8, NoStringIO())
     except IOError as err:
         message = str(err)
-    assert message == 'Expected {0} bytes, got {1} bytes from {2}\n' \
-                      ' - could the file be damaged?'.format(
-                      11390625000000000000, 0, 'object')
+    assert message == (f"Expected {11390625000000000000} bytes, got {0} "
+                       f"bytes from {'object'}\n - could the file be damaged?")
 
 
 def test__ftype4scaled_finite_warningfilters():

nibabel/volumeutils.py

@@ -526,11 +526,8 @@ def array_from_file(shape, in_dtype, infile, offset=0, order='F', mmap=True):
         n_read = len(data_bytes)
         needs_copy = True
     if n_bytes != n_read:
-        raise IOError('Expected {0} bytes, got {1} bytes from {2}\n'
-                      ' - could the file be damaged?'.format(
-                          n_bytes,
-                          n_read,
-                          getattr(infile, 'name', 'object')))
+        raise IOError(f"Expected {n_bytes} bytes, got {n_read} bytes from "
+                      f"{getattr(infile, 'name', 'object')}\n - could the file be damaged?")
     arr = np.ndarray(shape, in_dtype, buffer=data_bytes, order=order)
     if needs_copy:
         return arr.copy()
@@ -747,10 +744,8 @@ def array_to_file(data, fileobj, out_dtype=None, offset=0,
             # nan_fill can be (just) outside clip range
             nan_fill = np.clip(nan_fill, both_mn, both_mx)
         else:
-            raise ValueError("nan_fill == {0}, outside safe int range "
-                             "({1}-{2}); change scaling or "
-                             "set nan2zero=False?".format(
-                                 nan_fill, int(both_mn), int(both_mx)))
+            raise ValueError(f"nan_fill == {nan_fill}, outside safe int range "
+                             f"({int(both_mn)}-{int(both_mx)}); change scaling or set nan2zero=False?")
     # Make sure non-nan output clipped to shared range
     post_mn = np.max([post_mn, both_mn])
     post_mx = np.min([post_mx, both_mx])