STY: Apply suggestions from code review

Co-authored-by: Chris Markiewicz <[email protected]>

Author: jond01

nibabel/arrayproxy.py

@@ -412,8 +412,7 @@ def reshape(self, shape):
             shape = tuple(unknown_size if e == -1 else e for e in shape)
 
         if np.prod(shape) != size:
-            raise ValueError(f"cannot reshape array of size {size:d} "
-                             f"into shape {shape!s}")
+            raise ValueError(f"cannot reshape array of size {size:d} into shape {shape!s}")
         return self.__class__(file_like=self.file_like,
                               spec=(shape, self._dtype, self._offset,
                                     self._slope, self._inter),

nibabel/streamlines/array_sequence.py

@@ -438,8 +438,7 @@ def __setitem__(self, idx, elements):
 
         if is_array_sequence(elements):
             if len(lengths) != len(elements):
-                msg = (f"Trying to set {len(lengths)} sequences with "
-                       f"{len(elements)} sequences.")
+                msg = f"Trying to set {len(lengths)} sequences with {len(elements)} sequences."
                 raise ValueError(msg)
 
             if sum(lengths) != elements.total_nb_rows:

nibabel/streamlines/tck.py

@@ -340,9 +340,8 @@ def _read_header(fileobj):
             hdr['file'] = f'. {offset_data}'
 
         if hdr['file'].split()[0] != '.':
-            msg = (f"TCK only supports single-file - in other words the"
-                   f" filename part must be specified as '.' but "
-                   f"'{hdr['file'].split()[0]}' was specified.")
+            msg = ("TCK only supports single-file - in other words the filename part must be "
+                   f"specified as '.' but '{hdr['file'].split()[0]}' was specified.")
             raise HeaderError("Missing 'file' attribute in TCK header.")
 
         # Set endianness and _dtype attributes in the header.
@@ -453,6 +452,5 @@ def __str__(self):
         info = ""
         info += f"\nMAGIC NUMBER: {hdr[Field.MAGIC_NUMBER]}"
         info += "\n"
-        info += "\n".join([f"{k}: {v}"
-                           for k, v in hdr.items() if not k.startswith('_')])
+        info += "\n".join(f"{k}: {v}" for k, v in hdr.items() if not k.startswith('_'))
         return info

nibabel/streamlines/tractogram.py

@@ -168,8 +168,7 @@ def __setitem__(self, key, value):
 
         # We make sure there is the right amount of data.
         if 0 < self.n_rows != value.total_nb_rows:
-            msg = (f"The number of values ({value.total_nb_rows}) "
-                   f"should match ({self.n_rows}).")
+            msg = f"The number of values ({value.total_nb_rows}) should match ({self.n_rows})."
             raise ValueError(msg)
 
         self.store[key] = value

nibabel/streamlines/trk.py

@@ -153,8 +153,7 @@ def encode_value_in_name(value, name, max_name_len=20):
         `value`, padded with ``\x00`` bytes.
     """
     if len(name) > max_name_len:
-        msg = (f"Data information named '{name}' is too long"
-               f" (max {max_name_len} characters.)")
+        msg = f"Data information named '{name}' is too long (max {max_name_len} characters.)"
         raise ValueError(msg)
     encoded_name = name if value <= 1 else name + '\x00' + str(value)
     if len(encoded_name) > max_name_len:

nibabel/tests/data/check_parrec_reslice.py

@@ -61,8 +61,7 @@ def gmean_norm(data):
     normal_data = normal_img.get_fdata()
     normal_normed = gmean_norm(normal_data)
 
-    print(f"RMS of standard image {normal_fname:<44}: "
-          f"{np.sqrt(np.sum(normal_normed ** 2))}")
+    print(f"RMS of standard image {normal_fname:<44}: {np.sqrt(np.sum(normal_normed ** 2))}")
 
     for parfile in glob.glob("*.PAR"):
         if parfile == normal_fname:

nibabel/tests/test_deprecator.py

@@ -94,8 +94,7 @@ def test_dep_func(self):
             assert func() is None
             assert len(w) == 1
         assert (func.__doc__ ==
-                f'foo\n\n* Will raise {ExpiredDeprecationError} '
-                'as of version: 99.4\n')
+                f'foo\n\n* Will raise {ExpiredDeprecationError} as of version: 99.4\n')
         func = dec('foo', until='1.8')(func_no_doc)
         with pytest.raises(ExpiredDeprecationError):
             func()

nibabel/tests/test_volumeutils.py

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