small fixes

Author: orduek

nibabel/freesurfer/tests/test_io.py

@@ -51,18 +51,18 @@ def test_geometry():
     """Test IO of .surf"""
     surf_path = pjoin(data_path, "surf", "%s.%s" % ("lh", "inflated"))
     coords, faces = read_geometry(surf_path)
-    assert 0==faces.min()
-    assert coords.shape[0]== faces.max() + 1
+    assert 0 == faces.min()
+    assert coords.shape[0] == faces.max() + 1
 
     surf_path = pjoin(data_path, "surf", "%s.%s" % ("lh", "sphere"))
     coords, faces, volume_info, create_stamp = read_geometry(
         surf_path, read_metadata=True, read_stamp=True)
 
     assert 0 == faces.min()
-    assert coords.shape[0] == faces.max() + 1
+    assert coords.shape[0] == (faces.max() + 1)
     assert 9 == len(volume_info)
     assert [2, 0, 20] == volume_info['head']
-    assert 'created by greve on Thu Jun  8 19:17:51 2006' == create_stamp
+    assert ['created by greve on Thu Jun  8 19:17:51 2006'] == create_stamp
 
     # Test equivalence of freesurfer- and nibabel-generated triangular files
     # with respect to read_geometry()
@@ -121,7 +121,7 @@ def test_quad_geometry():
                      'bert', 'surf', 'lh.inflated.nofix')
     coords, faces = read_geometry(new_quad)
     assert 0 == faces.min()
-    assert coords.shape[0] == faces.max() + 1
+    assert coords.shape[0] == (faces.max() + 1)
     with InTemporaryDirectory():
         new_path = 'test'
         write_geometry(new_path, coords, faces)
@@ -135,8 +135,8 @@ def test_morph_data():
     """Test IO of morphometry data file (eg. curvature)."""
     curv_path = pjoin(data_path, "surf", "%s.%s" % ("lh", "curv"))
     curv = read_morph_data(curv_path)
-    assert(-1.0 < curv.min() < 0)
-    assert(0 < curv.max() < 1.0)
+    assert -1.0 < curv.min() < 0
+    assert 0 < curv.max() < 1.0
     with InTemporaryDirectory():
         new_path = 'test'
         write_morph_data(new_path, curv)
@@ -175,18 +175,18 @@ def test_annot():
         hash_ = _hash_file_content(annot_path)
 
         labels, ctab, names = read_annot(annot_path)
-        assert(labels.shape == (163842, ))
-        assert(ctab.shape == (len(names), 5))
+        assert labels.shape == (163842, )
+        assert ctab.shape == (len(names), 5)
 
         labels_orig = None
         if a == 'aparc':
             labels_orig, _, _ = read_annot(annot_path, orig_ids=True)
             np.testing.assert_array_equal(labels == -1, labels_orig == 0)
             # Handle different version of fsaverage
             if hash_ == 'bf0b488994657435cdddac5f107d21e8':
-                assert(np.sum(labels_orig == 0) == 13887)
+                assert np.sum(labels_orig == 0) == 13887
             elif hash_ == 'd4f5b7cbc2ed363ac6fcf89e19353504':
-                assert(np.sum(labels_orig == 1639705) == 13327)
+                assert np.sum(labels_orig == 1639705) == 13327
             else:
                 raise RuntimeError("Unknown freesurfer file. Please report "
                                    "the problem to the maintainer of nibabel.")
@@ -270,7 +270,7 @@ def test_write_annot_fill_ctab():
         print(labels)
         with clear_and_catch_warnings() as w:
             write_annot(annot_path, labels, rgbal, names, fill_ctab=False)
-        assert(
+        assert (
             any('Annotation values in {} will be incorrect'.format(
                 annot_path) == str(ww.message) for ww in w))
         labels2, rgbal2, names2 = read_annot(annot_path, orig_ids=True)
@@ -346,13 +346,13 @@ def test_label():
     label_path = pjoin(data_path, "label", "lh.cortex.label")
     label = read_label(label_path)
     # XXX : test more
-    assert(label.min() >= 0)
-    assert(label.max() <= 163841)
-    assert(label.shape[0] <= 163842)
+    assert label.min() >= 0
+    assert label.max() <= 163841
+    assert label.shape[0] <= 163842
 
     labels, scalars = read_label(label_path, True)
-    assert(np.all(labels == label))
-    assert(len(labels) == len(scalars))
+    assert (np.all(labels == label))
+    assert len(labels) == len(scalars)
 
 
 def test_write_annot_maxstruct():

nibabel/freesurfer/tests/test_mghformat.py

@@ -26,8 +26,7 @@
 
 import pytest
 
-from numpy.testing import (assert_array_equal,
-                           assert_array_almost_equal, assert_almost_equal)
+from numpy.testing import (assert_array_equal, assert_array_almost_equal, assert_almost_equal)
 
 
 from ...testing_pytest import data_path