TEST: Compatibility for numpy 1.7. Also some style fixes to make flake8 happier

Author: pauldmccarthy

nibabel/openers.py

@@ -70,16 +70,16 @@ def _gzip_open(fileish, mode='rb', compresslevel=9):
         have_indexed_gzip = False
 
     # is this a file? if not we assume it is a string
-    is_file = hasattr(fileish, 'read') and hasattr(fileish, 'write') and \
-              hasattr(fileish, 'mode')
+    is_file = (hasattr(fileish, 'read') and hasattr(fileish, 'write') and
+               hasattr(fileish, 'mode')
 
     # If we've been given a file object, we can't change its mode.
     if is_file:
         mode = fileish.mode
 
     # use indexed_gzip if possible for faster read access
     if mode == 'rb' and have_indexed_gzip:
-        kwargs = {'spacing' : 4194304, 'readbuf_size' : 1048576}
+        kwargs = {'spacing':4194304, 'readbuf_size':1048576}
         if hasattr(fileish, 'read') and hasattr(fileish, 'write'):
             gzip_file = SafeIndexedGzipFile(fid=fileish, **kwargs)
         else:

nibabel/tests/test_arrayproxy.py

@@ -353,7 +353,7 @@ def __init__(self, *args, **kwargs):
             proxy_no_kfp = ArrayProxy(fname, ((10, 10, 10), dtype))
             proxy_kfp = ArrayProxy(fname, ((10, 10, 10), dtype),
                                    keep_file_open=True)
-            voxels = np.random.randint(0, 10, (10, 3), dtype=np.uint32)
+            voxels = np.random.randint(0, 10, (10, 3))
             for i in range(voxels.shape[0]):
                 x , y, z = [int(c) for c in voxels[i, :]]
                 assert proxy_no_kfp[x, y, z] == x * 100 + y * 10 + z

nibabel/tests/test_fileslice.py

@@ -694,7 +694,7 @@ def test_read_segments():
 def test_read_segments_lock():
     # Test read_segment locking with multiple threads
     fobj = BytesIO()
-    arr = np.random.randint(0, 256, 1000, dtype=np.uint8)
+    arr = np.array(np.random.randint(0, 256, 1000), dtype=np.uint8)
     fobj.write(arr.tostring())
 
     # Encourage the interpreter to switch threads between a seek/read pair