STY: Use f-strings only where necessary

jond01 · jond01 · commit a3f51aa43f8b · 2020-06-22T21:59:39.000+03:00
+ remove str calls in f-strings, one line if possible
diff --git a/nibabel/cmdline/ls.py b/nibabel/cmdline/ls.py
@@ -73,7 +73,7 @@ def proc_file(f, opts):
         h = vol.header
     except Exception as e:
         row += ['failed']
-        verbose(2, f"Failed to gather information -- {str(e)}")
+        verbose(2, f"Failed to gather information -- {e}")
         return row
 
     row += [str(safe_get(h, 'data_dtype')),
diff --git a/nibabel/funcs.py b/nibabel/funcs.py
@@ -133,8 +133,7 @@ def concat_images(images, check_affines=True, axis=None):
     masked_shape = np.array(shape0)[idx_mask]
     for i, img in enumerate(images):
         if len(img.shape) != n_dim:
-            raise ValueError(
-                f'Image {i} has {len(img.shape)} dimensions, image 0 has {n_dim}')
+            raise ValueError(f'Image {i} has {len(img.shape)} dimensions, image 0 has {n_dim}')
         if not np.all(np.array(img.shape)[idx_mask] == masked_shape):
             raise ValueError(f'shape {img.shape} for image {i} not compatible with '
                              f'first image shape {shape0} with axis == {axis}')
diff --git a/nibabel/gifti/gifti.py b/nibabel/gifti/gifti.py
@@ -486,7 +486,7 @@ def to_xml_open(self):
 \tExternalFileOffset="%d">\n"""
         di = ""
         for i, n in enumerate(self.dims):
-            di = di + f'\tDim{i}="{n}"\n'
+            di = di + f'\tDim{i}="{n}\"\n'
         return out % (intent_codes.niistring[self.intent],
                       data_type_codes.niistring[self.datatype],
                       array_index_order_codes.label[self.ind_ord],
diff --git a/nibabel/parrec.py b/nibabel/parrec.py
@@ -429,8 +429,7 @@ def vol_is_full(slice_nos, slice_max, slice_min=1):
     """
     slice_set = set(range(slice_min, slice_max + 1))
     if not slice_set.issuperset(slice_nos):
-        raise ValueError(
-            f'Slice numbers outside inclusive range {slice_min} to {slice_max}')
+        raise ValueError(f'Slice numbers outside inclusive range {slice_min} to {slice_max}')
     vol_nos = np.array(vol_numbers(slice_nos))
     slice_nos = np.asarray(slice_nos)
     is_full = np.ones(slice_nos.shape, dtype=bool)
diff --git a/nibabel/streamlines/tck.py b/nibabel/streamlines/tck.py
@@ -211,14 +211,14 @@ def save(self, fileobj):
             data_for_streamline = first_item.data_for_streamline
             if len(data_for_streamline) > 0:
                 keys = ", ".join(data_for_streamline.keys())
-                msg = (f"TCK format does not support saving additional "
+                msg = ("TCK format does not support saving additional "
                        f"data alongside streamlines. Dropping: {keys}")
                 warnings.warn(msg, DataWarning)
 
             data_for_points = first_item.data_for_points
             if len(data_for_points) > 0:
                 keys = ", ".join(data_for_points.keys())
-                msg = (f"TCK format does not support saving additional "
+                msg = ("TCK format does not support saving additional "
                        f"data alongside points. Dropping: {keys}")
                 warnings.warn(msg, DataWarning)
 
@@ -330,13 +330,12 @@ def _read_header(fileobj):
             hdr['datatype'] = "Float32LE"
 
         if not hdr['datatype'].startswith('Float32'):
-            msg = (f"TCK only supports float32 dtype but 'datatype: "
+            msg = ("TCK only supports float32 dtype but 'datatype: "
                    f"{hdr['datatype']}' was specified in the header.")
             raise HeaderError(msg)
 
         if 'file' not in hdr:
-            msg = ("Missing 'file' attribute in TCK header."
-                   " Will try to guess it.")
+            msg = "Missing 'file' attribute in TCK header. Will try to guess it."
             warnings.warn(msg, HeaderWarning)
             hdr['file'] = f'. {offset_data}'
 
diff --git a/nibabel/streamlines/tractogram.py b/nibabel/streamlines/tractogram.py
@@ -108,9 +108,8 @@ def __setitem__(self, key, value):
             raise ValueError("data_per_streamline must be a 2D array.")
 
         # We make sure there is the right amount of values
-        if self.n_rows > 0 and len(value) != self.n_rows:
-            msg = (f"The number of values ({len(value)}) should match "
-                   f"n_elements ({self.n_rows}).")
+        if 0 < self.n_rows != len(value):
+            msg = f"The number of values ({len(value)}) should match n_elements ({self.n_rows})."
             raise ValueError(msg)
 
         self.store[key] = value
@@ -140,7 +139,7 @@ def extend(self, other):
         """
         if (len(self) > 0 and len(other) > 0 and
                 sorted(self.keys()) != sorted(other.keys())):
-            msg = (f"Entry mismatched between the two PerArrayDict objects. "
+            msg = ("Entry mismatched between the two PerArrayDict objects. "
                    f"This PerArrayDict contains '{sorted(self.keys())}' "
                    f"whereas the other contains '{sorted(other.keys())}'.")
             raise ValueError(msg)
@@ -364,7 +363,7 @@ def affine_to_rasmm(self, value):
         if value is not None:
             value = np.array(value)
             if value.shape != (4, 4):
-                msg = (f"Affine matrix has a shape of (4, 4) but a ndarray with"
+                msg = ("Affine matrix has a shape of (4, 4) but a ndarray with "
                        f"shape {value.shape} was provided instead.")
                 raise ValueError(msg)
 
diff --git a/nibabel/streamlines/trk.py b/nibabel/streamlines/trk.py
@@ -160,7 +160,7 @@ def encode_value_in_name(value, name, max_name_len=20):
     if len(encoded_name) > max_name_len:
         msg = (f"Data information named '{name}' is too long (need to be less"
                f" than {max_name_len - (len(str(value)) + 1)} characters "
-               f"when storing more than one value for a given data information.")
+               "when storing more than one value for a given data information.")
         raise ValueError(msg)
     # Fill to the end with zeros
     return encoded_name.ljust(max_name_len, '\x00').encode('latin1')
@@ -195,8 +195,8 @@ def decode_value_from_name(encoded_name):
         value = int(splits[1])  # Decode value.
     elif len(splits) > 2:
         # The remaining bytes are not \x00, raising.
-        msg = (f"Wrong scalar_name or property_name: '{encoded_name}'."
-               f" Unused characters should be \\x00.")
+        msg = (f"Wrong scalar_name or property_name: '{encoded_name}'. "
+               "Unused characters should be \\x00.")
         raise HeaderError(msg)
 
     return name, value
@@ -473,8 +473,8 @@ def save(self, fileobj):
             data_for_streamline = first_item.data_for_streamline
             if len(data_for_streamline) > MAX_NB_NAMED_PROPERTIES_PER_STREAMLINE:
                 msg = (f"Can only store {MAX_NB_NAMED_SCALARS_PER_POINT} named "
-                       f"data_per_streamline (also known as 'properties' in the "
-                       f"TRK format).")
+                       "data_per_streamline (also known as 'properties' in the "
+                       "TRK format).")
                 raise ValueError(msg)
 
             data_for_streamline_keys = sorted(data_for_streamline.keys())
@@ -491,8 +491,8 @@ def save(self, fileobj):
             data_for_points = first_item.data_for_points
             if len(data_for_points) > MAX_NB_NAMED_SCALARS_PER_POINT:
                 msg = (f"Can only store {MAX_NB_NAMED_SCALARS_PER_POINT} "
-                       f"named data_per_point (also known as 'scalars' in "
-                       f"the TRK format).")
+                       "named data_per_point (also known as 'scalars' in "
+                       "the TRK format).")
                 raise ValueError(msg)
 
             data_for_points_keys = sorted(data_for_points.keys())
@@ -615,8 +615,8 @@ def _read_header(fileobj):
             # able to determine the axis directions.
             axcodes = aff2axcodes(header[Field.VOXEL_TO_RASMM])
             if None in axcodes:
-                msg = (f"The 'vox_to_ras' affine is invalid! Could not"
-                       f" determine the axis directions from it.\n"
+                msg = ("The 'vox_to_ras' affine is invalid! Could not"
+                       " determine the axis directions from it.\n"
                        f"{header[Field.VOXEL_TO_RASMM]}")
                 raise HeaderError(msg)
 
diff --git a/nibabel/tests/test_deprecator.py b/nibabel/tests/test_deprecator.py
@@ -95,7 +95,7 @@ def test_dep_func(self):
             assert len(w) == 1
         assert (func.__doc__ ==
                 f'foo\n\n* Will raise {ExpiredDeprecationError} '
-                f'as of version: 99.4\n')
+                'as of version: 99.4\n')
         func = dec('foo', until='1.8')(func_no_doc)
         with pytest.raises(ExpiredDeprecationError):
             func()
@@ -105,13 +105,13 @@ def test_dep_func(self):
         with pytest.raises(ExpiredDeprecationError):
             func()
         assert (func.__doc__ ==
-                f'foo\n\n* deprecated from version: 1.2\n* Raises '
+                'foo\n\n* deprecated from version: 1.2\n* Raises '
                 f'{ExpiredDeprecationError} as of version: 1.8\n')
         func = dec('foo', '1.2', '1.8')(func_doc_long)
         assert (func.__doc__ ==
-                f'A docstring\n   \n   foo\n   \n   * deprecated from version: 1.2\n   '
+                'A docstring\n   \n   foo\n   \n   * deprecated from version: 1.2\n   '
                 f'* Raises {ExpiredDeprecationError} as of version: 1.8\n   \n'
-                f'   Some text\n')
+                '   Some text\n')
         with pytest.raises(ExpiredDeprecationError):
             func()
 
diff --git a/nibabel/tests/test_image_types.py b/nibabel/tests/test_image_types.py
@@ -98,7 +98,7 @@ def check_img(img_path, img_klass, sniff_mode, sniff, expect_success,
                 # Reuse the sniff... but it will only change for some
                 # sniff_mode values.
                 msg = (f'{expected_img_klass.__name__}/ {sniff_mode}/ '
-                       f'{str(expect_success)}')
+                       f'{expect_success}')
                 sniff = check_img(img_path, klass, sniff_mode=sniff_mode,
                                   sniff=sniff, expect_success=expect_success,
                                   msg=msg)
diff --git a/nibabel/tests/test_nifti1.py b/nibabel/tests/test_nifti1.py
@@ -266,7 +266,7 @@ def test_magic_offset_checks(self):
             assert fhdr['vox_offset'] == bad_spm
             assert (message ==
                     f'vox offset (={bad_spm:g}) not divisible by 16, '
-                    f'not SPM compatible; leaving at current value')
+                    'not SPM compatible; leaving at current value')
         # Check minimum offset (if offset set)
         hdr['magic'] = hdr.single_magic
         hdr['vox_offset'] = 10
diff --git a/nibabel/tests/test_scripts.py b/nibabel/tests/test_scripts.py
@@ -65,7 +65,7 @@ def load_small_file():
 def check_nib_ls_example4d(opts=[], hdrs_str="", other_str=""):
     # test nib-ls script
     fname = pjoin(DATA_PATH, 'example4d.nii.gz')
-    expected_re = (f" (int16|[<>]i2) \\[128,  96,  24,   2\\] 2.00x2.00x2.20x2000.00  "
+    expected_re = (" (int16|[<>]i2) \\[128,  96,  24,   2\\] 2.00x2.00x2.20x2000.00  "
                    f"#exts: 2{hdrs_str} sform{other_str}$")
     cmd = ['nib-ls'] + opts + [fname]
     code, stdout, stderr = run_command(cmd)
diff --git a/nibabel/trackvis.py b/nibabel/trackvis.py
@@ -471,7 +471,7 @@ def _check_hdr_points_space(hdr, points_space):
         voxel_size = hdr['voxel_size']
         if np.any(voxel_size < 0):
             raise HeaderError(f'Negative voxel sizes {voxel_size} not '
-                              f'valid for voxel - voxmm conversion')
+                              'valid for voxel - voxmm conversion')
         if np.all(voxel_size == 0):
             raise HeaderError('Cannot convert between voxels and voxmm when '
                               '"voxel_sizes" all 0')
@@ -501,8 +501,7 @@ def _check_hdr_points_space(hdr, points_space):
             raise HeaderError(f'Affine implies voxel_order {aff_order} '
                               f'but header voxel_order is {voxel_order}')
     else:
-        raise ValueError(f'Painfully confusing "points_space" value of '
-                         f'"{points_space}"')
+        raise ValueError(f'Painfully confusing "points_space" value of "{points_space}"')
 
 
 def _hdr_from_mapping(hdr=None, mapping=None, endianness=native_code):
@@ -669,7 +668,7 @@ def aff_from_hdr(trk_hdr, atleast_v2=True):
         aff[:, 2] *= -1
         exp_order = ''.join(aff2axcodes(aff))
         if voxel_order != exp_order:
-            raise HeaderError(f'Estimate of header affine does not match '
+            raise HeaderError('Estimate of header affine does not match '
                               f'voxel_order of {exp_order}')
     return aff
 
diff --git a/nibabel/viewers.py b/nibabel/viewers.py
@@ -294,7 +294,7 @@ def link_to(self, other):
             Other viewer to use to link movements.
         """
         if not isinstance(other, self.__class__):
-            raise TypeError(f'other must be an instance of '
+            raise TypeError('other must be an instance of '
                             f'{self.__class__.__name__}, not {type(other)}')
         self._link(other, is_primary=True)
 
diff --git a/nibabel/volumeutils.py b/nibabel/volumeutils.py
@@ -746,7 +746,7 @@ def array_to_file(data, fileobj, out_dtype=None, offset=0,
         else:
             raise ValueError(f"nan_fill == {nan_fill}, outside safe int range "
                              f"({int(both_mn)}-{int(both_mx)}); "
-                             f"change scaling or set nan2zero=False?")
+                             "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])
