STY: pyupgrade --py37-plus

Mostly motivated by excessive use of arguments to super().
Also caught a number of `np.array(X).astype(Y)` to convert to
`np.array(X, Y)`.

[git-blame-ignore-rev]

Author: effigies

nibabel/analyze.py

@@ -248,7 +248,7 @@ def __init__(self, binaryblock=None, endianness=None, check=True):
         >>> hdr4.endianness == swapped_code
         True
         """
-        super(AnalyzeHeader, self).__init__(binaryblock, endianness, check)
+        super().__init__(binaryblock, endianness, check)
 
     @classmethod
     def guessed_endian(klass, hdr):
@@ -336,7 +336,7 @@ def guessed_endian(klass, hdr):
     @classmethod
     def default_structarr(klass, endianness=None):
         """Return header data for empty header with given endianness"""
-        hdr_data = super(AnalyzeHeader, klass).default_structarr(endianness)
+        hdr_data = super().default_structarr(endianness)
         hdr_data['sizeof_hdr'] = klass.sizeof_hdr
         hdr_data['dim'] = 1
         hdr_data['dim'][0] = 0
@@ -904,7 +904,7 @@ class AnalyzeImage(SpatialImage):
     ImageArrayProxy = ArrayProxy
 
     def __init__(self, dataobj, affine, header=None, extra=None, file_map=None, dtype=None):
-        super(AnalyzeImage, self).__init__(dataobj, affine, header, extra, file_map)
+        super().__init__(dataobj, affine, header, extra, file_map)
         # Reset consumable values
         self._header.set_data_offset(0)
         self._header.set_slope_inter(None, None)

nibabel/arraywriters.py

@@ -313,7 +313,7 @@ def scaling_needed(self):
           data are within range of the output type, return False
         * Otherwise return True
         """
-        if not super(SlopeArrayWriter, self).scaling_needed():
+        if not super().scaling_needed():
             return False
         mn, mx = self.finite_range()  # this is cached
         # No finite data - no scaling needed
@@ -428,7 +428,7 @@ 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(
@@ -507,13 +507,11 @@ def __init__(self, array, out_dtype=None, calc_scale=True, scaler_dtype=np.float
         >>> (aw.slope, aw.inter) == (1.0, 128)
         True
         """
-        super(SlopeInterArrayWriter, self).__init__(
-            array, out_dtype, calc_scale, scaler_dtype, **kwargs
-        )
+        super().__init__(array, out_dtype, calc_scale, scaler_dtype, **kwargs)
 
     def reset(self):
         """Set object to values before any scaling calculation"""
-        super(SlopeInterArrayWriter, self).reset()
+        super().reset()
         self.inter = 0.0
 
     def _get_inter(self):
@@ -549,14 +547,14 @@ def to_fileobj(self, fileobj, order='F'):
 
     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?
@@ -579,7 +577,7 @@ def _iu2iu(self):
                 self.inter = inter
                 return
         # Try slope options (sign flip) and then range scaling
-        super(SlopeInterArrayWriter, self)._iu2iu()
+        super()._iu2iu()
 
     def _range_scale(self, in_min, in_max):
         """Calculate scaling, intercept based on data range and output type"""
@@ -604,7 +602,7 @@ 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/brikhead.py

@@ -195,7 +195,7 @@ def parse_AFNI_header(fobj):
     """
     # edge case for being fed a filename instead of a file object
     if isinstance(fobj, str):
-        with open(fobj, 'rt') as src:
+        with open(fobj) as src:
             return parse_AFNI_header(src)
     # unpack variables in HEAD file
     head = fobj.read().split('\n\n')
@@ -239,9 +239,7 @@ def __init__(self, file_like, header, *, mmap=True, keep_file_open=None):
             effect. The default value (``None``) will result in the value of
             ``nibabel.arrayproxy.KEEP_FILE_OPEN_DEFAULT`` being used.
         """
-        super(AFNIArrayProxy, self).__init__(
-            file_like, header, mmap=mmap, keep_file_open=keep_file_open
-        )
+        super().__init__(file_like, header, mmap=mmap, keep_file_open=keep_file_open)
         self._scaling = header.get_data_scaling()
 
     @property
@@ -293,9 +291,7 @@ def __init__(self, info):
         """
         self.info = info
         dt = _get_datatype(self.info)
-        super(AFNIHeader, self).__init__(
-            data_dtype=dt, shape=self._calc_data_shape(), zooms=self._calc_zooms()
-        )
+        super().__init__(data_dtype=dt, shape=self._calc_data_shape(), zooms=self._calc_zooms())
 
     @classmethod
     def from_header(klass, header=None):
@@ -553,7 +549,7 @@ def filespec_to_file_map(klass, filespec):
             If `filespec` is not recognizable as being a filename for this
             image type.
         """
-        file_map = super(AFNIImage, klass).filespec_to_file_map(filespec)
+        file_map = super().filespec_to_file_map(filespec)
         # check for AFNI-specific BRIK/HEAD compression idiosyncrasies
         for key, fholder in file_map.items():
             fname = fholder.filename

nibabel/cifti2/cifti2.py

@@ -1451,7 +1451,7 @@ def __init__(
         """
         if not isinstance(header, Cifti2Header) and header:
             header = Cifti2Header.from_axes(header)
-        super(Cifti2Image, self).__init__(dataobj, header=header, extra=extra, file_map=file_map)
+        super().__init__(dataobj, header=header, extra=extra, file_map=file_map)
         self._nifti_header = LimitedNifti2Header.from_header(nifti_header)
 
         # if NIfTI header not specified, get data type from input array

nibabel/cifti2/parse_cifti2.py

@@ -91,7 +91,7 @@ def _valid_intent_code(klass, intent_code):
 
     @classmethod
     def may_contain_header(klass, binaryblock):
-        if not super(_Cifti2AsNiftiHeader, klass).may_contain_header(binaryblock):
+        if not super().may_contain_header(binaryblock):
             return False
         hdr = klass(binaryblock=binaryblock[: klass.sizeof_hdr])
         return klass._valid_intent_code(hdr.get_intent('code')[0])
@@ -135,9 +135,7 @@ class Cifti2Parser(xml.XmlParser):
     """Class to parse an XML string into a CIFTI-2 header object"""
 
     def __init__(self, encoding=None, buffer_size=3500000, verbose=0):
-        super(Cifti2Parser, self).__init__(
-            encoding=encoding, buffer_size=buffer_size, verbose=verbose
-        )
+        super().__init__(encoding=encoding, buffer_size=buffer_size, verbose=verbose)
         self.fsm_state = []
         self.struct_state = []
 

nibabel/cmdline/diff.py

@@ -248,7 +248,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/roi.py

@@ -22,7 +22,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):