RF+DOC: PEP8 / docstring fixes from Eric's review

Use 'A is not None' instead of 'not A is None'.

Fix incorrect docstring mentions of 'r+'.

Author: matthew-brett

nibabel/analyze.py

@@ -938,7 +938,7 @@ def from_file_map(klass, file_map, mmap=True):
         -------
         img : AnalyzeImage 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'}")
         hdr_fh, img_fh = klass._get_fileholders(file_map)
         with hdr_fh.get_prepare_fileobj(mode='rb') as hdrf:
@@ -978,7 +978,7 @@ def from_filename(klass, filename, mmap=True):
         -------
         img : Analyze Image 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/arrayproxy.py

@@ -56,7 +56,8 @@ class ArrayProxy(object):
     including Nifti1, and with the MGH format.
 
     Other image types might need more specific classes to implement the API.
-    API.  See :mod:`nibabel.minc1` and :mod:`nibabel.ecat` for examples.
+    See :mod:`nibabel.minc1`, :mod:`nibabel.ecat` and :mod:`nibabel.parrec` for
+    examples.
     """
     # Assume Fortran array memory layout
     order = 'F'
@@ -76,12 +77,14 @@ def __init__(self, file_like, header, mmap=True):
         mmap : {True, False, 'c', 'r'}, optional, keyword only
             `mmap` controls the use of numpy memory mapping for reading data.
             If False, do not try numpy ``memmap`` for data array.  If one of
-            {'c', 'r', 'r+'}, try numpy memmap with ``mode=mmap``.  A `mmap`
-            value of True gives the same behavior as ``mmap='c'``.  If
-            `file_like` cannot be memory-mapped, ignore `mmap` value and read
-            array from file.
+            {'c', 'r'}, try numpy memmap with ``mode=mmap``.  A `mmap` value of
+            True gives the same behavior as ``mmap='c'``.  If `file_like`
+            cannot be memory-mapped, ignore `mmap` value and read array from
+            file.
+        scaling : {'fp', 'dv'}, optional, keyword only
+            Type of scaling to use - see header ``get_data_scaling`` method.
         """
-        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'}")
         self.file_like = file_like
         # Copies of values needed to read array

nibabel/parrec.py

@@ -463,7 +463,7 @@ def _data_from_rec(rec_fileobj, in_shape, dtype, slice_indices, out_shape,
     rec_data = array_from_file(in_shape, dtype, rec_fileobj, mmap=mmap)
     rec_data = rec_data[..., slice_indices]
     rec_data = rec_data.reshape(out_shape, order='F')
-    if not scalings is None:
+    if scalings is not None:
         # Don't do in-place b/c this goes int16 -> float64
         rec_data = rec_data * scalings[0] + scalings[1]
     return rec_data
@@ -485,14 +485,14 @@ def __init__(self, file_like, header, mmap=True, scaling='dv'):
         mmap : {True, False, 'c', 'r'}, optional, keyword only
             `mmap` controls the use of numpy memory mapping for reading data.
             If False, do not try numpy ``memmap`` for data array.  If one of
-            {'c', 'r', 'r+'}, try numpy memmap with ``mode=mmap``.  A `mmap`
-            value of True gives the same behavior as ``mmap='c'``.  If
-            `file_like` cannot be memory-mapped, ignore `mmap` value and read
-            array from file.
+            {'c', 'r'}, try numpy memmap with ``mode=mmap``.  A `mmap` value of
+            True gives the same behavior as ``mmap='c'``.  If `file_like`
+            cannot be memory-mapped, ignore `mmap` value and read array from
+            file.
         scaling : {'fp', 'dv'}, optional, keyword only
             Type of scaling to use - see header ``get_data_scaling`` method.
         """
-        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'}")
         self.file_like = file_like
         # Copies of values needed to read array