Apply pyupgrade suggestions

Author: DimitriPapadopoulos

doc/tools/apigen.py

@@ -42,7 +42,7 @@ def __init__(self,
                  module_skip_patterns=None,
                  other_defines=True
                  ):
-        """ Initialize package for parsing
+        r""" Initialize package for parsing
 
         Parameters
         ----------
@@ -358,7 +358,7 @@ def _survives_exclude(self, matchstr, match_type):
         return True
 
     def discover_modules(self):
-        """ Return module sequence discovered from ``self.package_name``
+        r""" Return module sequence discovered from ``self.package_name``
 
 
         Parameters

nibabel/arraywriters.py

@@ -438,8 +438,8 @@ def _range_scale(self, in_min, in_max):
             # not lose precision because min/max are of fp type.
             out_min, out_max = np.array((out_min, out_max), dtype=big_float)
         else:  # (u)int
-            out_min, out_max = [int_to_float(v, big_float)
-                                for v in (out_min, out_max)]
+            out_min, out_max = (int_to_float(v, big_float)
+                                for v in (out_min, out_max))
         if self._out_dtype.kind == 'u':
             if in_min < 0 and in_max > 0:
                 raise WriterError('Cannot scale negative and positive '
@@ -562,15 +562,15 @@ def to_fileobj(self, fileobj, order='F', nan2zero=None):
 
     def _iu2iu(self):
         # (u)int to (u)int
-        mn, mx = [as_int(v) for v in self.finite_range()]
+        mn, mx = (as_int(v) for v in self.finite_range())
         # range may be greater than the largest integer for this type.
         # as_int needed to work round numpy 1.4.1 int casting bug
         out_dtype = self._out_dtype
         # Options in this method are scaling using intercept only.  These will
         # have to pass through ``self.scaler_dtype`` (because the intercept is
         # in this type).
-        o_min, o_max = [as_int(v)
-                        for v in shared_range(self.scaler_dtype, out_dtype)]
+        o_min, o_max = (as_int(v)
+                        for v in shared_range(self.scaler_dtype, out_dtype))
         type_range = o_max - o_min
         mn2mx = mx - mn
         if mn2mx <= type_range:  # might offset be enough?
@@ -619,8 +619,8 @@ def _range_scale(self, in_min, in_max):
             in_min, in_max = as_int(in_min), as_int(in_max)
             in_range = int_to_float(in_max - in_min, big_float)
             # Cast to float for later processing.
-            in_min, in_max = [int_to_float(v, big_float)
-                              for v in (in_min, in_max)]
+            in_min, in_max = (int_to_float(v, big_float)
+                              for v in (in_min, in_max))
         if out_dtype.kind == 'f':
             # Type range, these are also floats
             info = type_info(out_dtype)

nibabel/cifti2/cifti2.py

@@ -648,8 +648,8 @@ def __init__(self, name=None, voxel_indices_ijk=None, vertices=None):
         self.vertices = vertices if vertices is not None else []
         for val in self.vertices:
             if not isinstance(val, Cifti2Vertices):
-                raise ValueError(('Cifti2Parcel vertices must be instances of '
-                                  'Cifti2Vertices'))
+                raise ValueError('Cifti2Parcel vertices must be instances of '
+                                 'Cifti2Vertices')
 
     @property
     def voxel_indices_ijk(self):

nibabel/cifti2/tests/test_axes.py

@@ -93,10 +93,8 @@ def get_axes():
     yield get_parcels()
     yield get_scalar()
     yield get_label()
-    for elem in get_brain_models():
-        yield elem
-    for elem in get_series():
-        yield elem
+    yield from get_brain_models()
+    yield from get_series()
 
 
 def test_brain_models():

nibabel/cifti2/tests/test_cifti2io_header.py

@@ -50,7 +50,7 @@ def test_read_nifti2():
     # Error trying to read a CIFTI-2 image from a NIfTI2-only image.
     filemap = ci.Cifti2Image.make_file_map()
     for k in filemap:
-        filemap[k].fileobj = io.open(NIFTI2_DATA)
+        filemap[k].fileobj = open(NIFTI2_DATA)
     with pytest.raises(ValueError):
         ci.Cifti2Image.from_file_map(filemap)
 

nibabel/cmdline/diff.py

@@ -234,7 +234,7 @@ def get_data_diff(files, max_abs=0, max_rel=0, dtype=np.float64):
                         # Since we operated on sub-selected values already, we need
                         # to plug them back in
                         candidates[
-                            tuple((indexes[sub_thr] for indexes in np.where(candidates)))
+                            tuple(indexes[sub_thr] for indexes in np.where(candidates))
                         ] = False
                     max_rel_diff = np.max(rel_diff)
                 else:

nibabel/cmdline/ls.py

@@ -145,7 +145,7 @@ def proc_file(f, opts):
                     freq = np.bincount(inv)
                     counts = " ".join("%g:%d" % (i, f) for i, f in zip(items, freq))
                 row += ["@l" + counts]
-        except IOError as e:
+        except OSError as e:
             verbose(2, f"Failed to obtain stats/counts -- {e}")
             row += [_err()]
     return row

nibabel/cmdline/parrec2nii.py

@@ -158,7 +158,7 @@ def proc_file(infile, opts):
     else:
         outfilename = basefilename + '.nii'
     if os.path.isfile(outfilename) and not opts.overwrite:
-        raise IOError(f'Output file "{outfilename}" exists, use --overwrite to overwrite it')
+        raise OSError(f'Output file "{outfilename}" exists, use --overwrite to overwrite it')
 
     # load the PAR header and data
     scaling = 'dv' if opts.scaling == 'off' else opts.scaling

nibabel/cmdline/roi.py

@@ -21,7 +21,7 @@ def lossless_slice(img, slicers):
 def parse_slice(crop, allow_step=True):
     if crop is None:
         return slice(None)
-    start, stop, *extra = [int(val) if val else None for val in crop.split(":")]
+    start, stop, *extra = (int(val) if val else None for val in crop.split(":"))
     if len(extra) > 1:
         raise ValueError(f"Cannot parse specification: {crop}")
     if not allow_step and extra and extra[0] not in (1, None):

nibabel/ecat.py

@@ -471,7 +471,7 @@ def get_series_framenumbers(mlist):
         try:
             frame_dict[frame_stored] = trueframenumbers[true_order] + 1
         except IndexError:
-            raise IOError('Error in header or mlist order unknown')
+            raise OSError('Error in header or mlist order unknown')
     return frame_dict