STY: flake8 manual fixes

Author: Ben Cipollini

nibabel/affines.py

@@ -166,7 +166,7 @@ def from_matvec(matrix, vector=None):
     t = np.zeros((nin + 1, nout + 1), matrix.dtype)
     t[0:nin, 0:nout] = matrix
     t[nin, nout] = 1.
-    if not vector is None:
+    if vector is not None:
         t[0:nin, nout] = vector
     return t
 

nibabel/casting.py

@@ -269,7 +269,7 @@ def type_info(np_type):
     # Oh dear, we don't recognize the type information.  Try some known types
     # and then give up. At this stage we're expecting exotic longdouble or
     # their complex equivalent.
-    if not np_type in (np.longdouble, np.longcomplex) or width not in (16, 32):
+    if np_type not in (np.longdouble, np.longcomplex) or width not in (16, 32):
         raise FloatingError('We had not expected type %s' % np_type)
     if (vals == (1, 1, 16) and on_powerpc() and
             _check_maxexp(np.longdouble, 1024)):
@@ -439,7 +439,7 @@ def int_to_float(val, flt_type):
     f : numpy scalar
         of type `flt_type`
     """
-    if not flt_type is np.longdouble:
+    if flt_type is not np.longdouble:
         return flt_type(val)
     # The following works around a nasty numpy 1.4.1 bug such that:
     # >>> int(np.uint32(2**32-1)

nibabel/checkwarns.py

@@ -15,7 +15,8 @@
 from .testing import (error_warnings, suppress_warnings)
 
 
-warnings.warn('The checkwarns module is deprecated and will be removed in nibabel v3.0', FutureWarning)
+warnings.warn('The checkwarns module is deprecated and will be removed '
+              'in nibabel v3.0', FutureWarning)
 
 
 class ErrorWarnings(error_warnings):

nibabel/data.py

@@ -298,7 +298,7 @@ def make_datasource(pkg_def, **kwargs):
                e)
         if 'name' in pkg_def:
             msg += '\n\nYou may need the package "%s"' % pkg_def['name']
-        if not pkg_hint is None:
+        if pkg_hint is not None:
             msg += '\n\n%s' % pkg_hint
         raise DataError(msg)
     return VersionedDatasource(pth)

nibabel/ecat.py

@@ -305,16 +305,17 @@ def get_data_dtype(self):
 
     def get_patient_orient(self):
         """ gets orientation of patient based on code stored
-        in header, not always reliable"""
+        in header, not always reliable
+        """
         code = self._structarr['patient_orientation'].item()
-        if not code in self._patient_orient_codes:
+        if code not in self._patient_orient_codes:
             raise KeyError('Ecat Orientation CODE %d not recognized' % code)
         return self._patient_orient_codes[code]
 
     def get_filetype(self):
         """ Type of ECAT Matrix File from code stored in header"""
         code = self._structarr['file_type'].item()
-        if not code in self._ft_codes:
+        if code not in self._ft_codes:
             raise KeyError('Ecat Filetype CODE %d not recognized' % code)
         return self._ft_codes[code]
 
@@ -368,7 +369,7 @@ def read_mlist(fileobj, endianness):
       `nused` in CTI code).
     """
     dt = np.dtype(np.int32)
-    if not endianness is native_code:
+    if endianness is not native_code:
         dt = dt.newbyteorder(endianness)
     mlists = []
     mlist_index = 0
@@ -496,7 +497,7 @@ def read_subheaders(fileobj, mlist, endianness):
     """
     subheaders = []
     dt = subhdr_dtype
-    if not endianness is native_code:
+    if endianness is not native_code:
         dt = dt.newbyteorder(endianness)
     for mat_id, sh_blkno, sh_last_blkno, mat_stat in mlist:
         if sh_blkno == 0:
@@ -630,7 +631,7 @@ def raw_data_from_fileobj(self, frame=0, orientation=None):
         .. seealso:: data_from_fileobj
         '''
         dtype = self._get_data_dtype(frame)
-        if not self._header.endianness is native_code:
+        if self._header.endianness is not native_code:
             dtype = dtype.newbyteorder(self._header.endianness)
         shape = self.get_shape(frame)
         offset = self._get_frame_offset(frame)
@@ -700,7 +701,7 @@ def __getitem__(self, sliceobj):
         """
         sliceobj = canonical_slicers(sliceobj, self.shape)
         # Indices into sliceobj referring to image axes
-        ax_inds = [i for i, obj in enumerate(sliceobj) if not obj is None]
+        ax_inds = [i for i, obj in enumerate(sliceobj) if obj is not None]
         assert len(ax_inds) == len(self.shape)
         frame_mapping = get_frame_order(self._subheader._mlist)
         # Analyze index for 4th axis
@@ -786,7 +787,7 @@ def __init__(self, dataobj, affine, header,
         self._subheader = subheader
         self._mlist = mlist
         self._dataobj = dataobj
-        if not affine is None:
+        if affine is not None:
             # Check that affine is array-like 4,4.  Maybe this is too strict at
             # this abstract level, but so far I think all image formats we know
             # do need 4,4.
@@ -863,7 +864,8 @@ def _get_fileholders(file_map):
     @classmethod
     def from_file_map(klass, file_map):
         """class method to create image from mapping
-        specified in file_map"""
+        specified in file_map
+        """
         hdr_file, img_file = klass._get_fileholders(file_map)
         # note header and image are in same file
         hdr_fid = hdr_file.get_prepare_fileobj(mode='rb')

nibabel/fileslice.py

@@ -92,7 +92,7 @@ def canonical_slicers(sliceobj, shape, check_inds=True):
             if Ellipsis in remaining:
                 raise ValueError("More than one Ellipsis in slicing "
                                  "expression")
-            real_remaining = [r for r in remaining if not r is None]
+            real_remaining = [r for r in remaining if r is not None]
             n_ellided = n_dim - n_real - len(real_remaining)
             can_slicers.extend((slice(None),) * n_ellided)
             n_real += n_ellided
@@ -144,7 +144,7 @@ def slice2outax(ndim, sliceobj):
         if isinstance(obj, Integral):
             out_ax_inds.append(None)
             continue
-        if not obj is None:
+        if obj is not None:
             out_ax_inds.append(out_ax_no)
         out_ax_no += 1
     return tuple(out_ax_inds)
@@ -210,9 +210,9 @@ def fill_slicer(slicer, in_len):
     start, stop, step = slicer.start, slicer.stop, slicer.step
     if step is None:
         step = 1
-    if not start is None and start < 0:
+    if start is not None and start < 0:
         start = in_len + start
-    if not stop is None and stop < 0:
+    if stop is not None and stop < 0:
         stop = in_len + stop
     if step > 0:
         if start is None:
@@ -424,7 +424,7 @@ def optimize_slicer(slicer, dim_len, all_full, is_slowest, stride,
         elif action == 'contiguous':  # Cannot be int
             # If this is already contiguous, default None behavior handles it
             step = slicer.step
-            if not step in (-1, 1):
+            if step not in (-1, 1):
                 if step < 0:
                     slicer = _positive_slice(slicer)
                 return (slice(slicer.start, slicer.stop, 1),
@@ -480,7 +480,7 @@ def calc_slicedefs(sliceobj, in_shape, itemsize, offset, order,
         `segments` and reshaping via `read_shape`.  Slices are in terms of
         `read_shape`.  If empty, no new slicing to apply
     """
-    if not order in "CF":
+    if order not in "CF":
         raise ValueError("order should be one of 'CF'")
     sliceobj = canonical_slicers(sliceobj, in_shape)
     # order fastest changing first (record reordering)

nibabel/freesurfer/mghformat.py

@@ -492,7 +492,7 @@ def from_file_map(klass, file_map, mmap=True):
             image data file cannot be memory-mapped, ignore `mmap` value and
             read array from file.
         '''
-        if not mmap in (True, False, 'c', 'r'):
+        if mmap not in (True, False, 'c', 'r'):
             raise ValueError("mmap should be one of {True, False, 'c', 'r'}")
         img_fh = file_map['image']
         mghf = img_fh.get_prepare_fileobj('rb')
@@ -528,7 +528,7 @@ def from_filename(klass, filename, mmap=True):
         -------
         img : MGHImage instance
         '''
-        if not mmap in (True, False, 'c', 'r'):
+        if mmap not in (True, False, 'c', 'r'):
             raise ValueError("mmap should be one of {True, False, 'c', 'r'}")
         file_map = klass.filespec_to_file_map(filename)
         return klass.from_file_map(file_map, mmap=mmap)

nibabel/info.py

@@ -11,7 +11,7 @@
 _version_minor = 1
 _version_micro = 0
 _version_extra = 'dev'
-#_version_extra = ''
+# _version_extra = ''
 
 # Format expected by setup.py and doc/source/conf.py: string of form "X.Y.Z"
 __version__ = "%s.%s.%s%s" % (_version_major,
@@ -109,8 +109,7 @@
 
 # Main setup parameters
 NAME = 'nibabel'
-MAINTAINER          = "Matthew Brett, Michael Hanke, Eric Larson, " \
-                      "Chris Markiewicz"
+MAINTAINER = "Matthew Brett, Michael Hanke, Eric Larson, Chris Markiewicz"
 MAINTAINER_EMAIL = "neuroimaging@python.org"
 DESCRIPTION = description
 LONG_DESCRIPTION = long_description

nibabel/minc.py

@@ -7,4 +7,4 @@
               FutureWarning,
               stacklevel=2)
 
-from .minc1 import *
+from .minc1 import *  # noqa

nibabel/minc1.py

@@ -199,7 +199,7 @@ def _normalize(self, data, sliceobj=()):
             shape = self.get_data_shape()
             sliceobj = canonical_slicers(sliceobj, shape)
             # Indices into sliceobj referring to image axes
-            ax_inds = [i for i, obj in enumerate(sliceobj) if not obj is None]
+            ax_inds = [i for i, obj in enumerate(sliceobj) if obj is not None]
             assert len(ax_inds) == len(shape)
             # Slice imax, imin using same slicer as for data
             nscales_ax = ax_inds[nscales]