MAINT: PEP8 and import cleanup for cifti2 tests

No functional changes.

Author: matthew-brett

nibabel/cifti2/tests/test_cifti2.py

@@ -5,15 +5,9 @@
 
 import numpy as np
 
-from ...nifti1 import data_type_codes, intent_codes
-
-from ... import cifti2 as ci
-
-from numpy.testing import (assert_array_almost_equal,
-                           assert_array_equal)
-
-from nose.tools import assert_true, assert_equal, assert_raises, assert_is_none
+from nibabel import cifti2 as ci
 
+from nose.tools import assert_equal, assert_raises, assert_is_none
 
 
 def compare_xml_leaf(str1, str2):
@@ -27,6 +21,7 @@ def compare_xml_leaf(str1, str2):
     print((x2.tag, x2.attrib, x2.text))
     return test
 
+
 def test_cifti2_metadata():
     md = ci.Cifti2MetaData()
     assert_equal(len(md), 0)
@@ -61,6 +56,7 @@ def test_cifti2_metadata():
     assert_equal(md.to_xml().decode('utf-8'),
                  '<MetaData><MD><Name>b</Name><Value>bval</Value></MD></MetaData>')
 
+
 def test_cifti2_labeltable():
     lt = ci.Cifti2LabelTable()
     assert_equal(len(lt), 0)
@@ -90,7 +86,6 @@ def test_cifti2_labeltable():
     assert_raises(ValueError, lt.__setitem__, 0, test_tuple[:-1])
 
 
-
 def test_cifti2_label():
     lb = ci.Cifti2Label()
     lb.label = 'Test'
@@ -120,11 +115,13 @@ def test_cifti2_label():
     assert_raises(ci.CIFTI2HeaderError, lb.to_xml)
     lb.key = 0
 
+
 def test_cifti2_parcel():
     pl = ci.Cifti2Parcel()
     assert_raises(ci.CIFTI2HeaderError, pl.to_xml)
     assert_raises(TypeError, pl.append_cifti_vertices, None)
 
+
 def test_cifti2_vertices():
     vs = ci.Cifti2Vertices()
     assert_raises(ci.CIFTI2HeaderError, vs.to_xml)
@@ -146,18 +143,22 @@ def test_cifti2_vertices():
     assert_equal(vs[0], 10)
     assert_equal(len(vs), 3)
 
+
 def test_cifti2_transformationmatrixvoxelindicesijktoxyz():
     tr = ci.Cifti2TransformationMatrixVoxelIndicesIJKtoXYZ()
     assert_raises(ci.CIFTI2HeaderError, tr.to_xml)
 
+
 def test_cifti2_surface():
     s = ci.Cifti2Surface()
     assert_raises(ci.CIFTI2HeaderError, s.to_xml)
 
+
 def test_cifti2_volume():
     vo = ci.Cifti2Volume()
     assert_raises(ci.CIFTI2HeaderError, vo.to_xml)
 
+
 def test_cifti2_vertexindices():
     vi = ci.Cifti2VertexIndices()
     assert_equal(len(vi), 0)
@@ -172,7 +173,7 @@ def test_cifti2_vertexindices():
     vi[0] = 10
     assert_equal(vi[0], 10)
     assert_equal(len(vi), 3)
-    
+
 
 def test_cifti2_voxelindicesijk():
     vi = ci.Cifti2VoxelIndicesIJK()
@@ -214,6 +215,7 @@ def test_cifti2_voxelindicesijk():
         '<VoxelIndicesIJK>0 1 2\n3 4 6</VoxelIndicesIJK>'
     )
 
+
 def test_matrixindicesmap():
     mim = ci.Cifti2MatrixIndicesMap(0, 'CIFTI_INDEX_TYPE_LABELS')
     volume = ci.Cifti2Volume()
@@ -243,6 +245,7 @@ def test_matrixindicesmap():
 
     assert_raises(ValueError, setattr, mim, 'volume', parcel)
 
+
 def test_matrix():
     m = ci.Cifti2Matrix()
     assert_raises(TypeError, m, setattr, 'metadata', ci.Cifti2Parcel())

nibabel/cifti2/tests/test_cifti2io.py

@@ -9,20 +9,16 @@
 from __future__ import division, print_function, absolute_import
 
 from os.path import join as pjoin, dirname
-import sys
 import io
 from distutils.version import LooseVersion
 
-import numpy as np
-
 import nibabel as nib
 from nibabel import cifti2 as ci
 from nibabel.tmpdirs import InTemporaryDirectory
 from nibabel.tests.nibabel_data import get_nibabel_data, needs_nibabel_data
 
-from numpy.testing import assert_array_equal, assert_array_almost_equal
-from nose.tools import (assert_true, assert_false, assert_equal,
-                        assert_raises)
+from numpy.testing import assert_array_almost_equal
+from nose.tools import (assert_true, assert_equal, assert_raises)
 
 NIBABEL_TEST_DATA = pjoin(dirname(nib.__file__), 'tests', 'data')
 NIFTI2_DATA = pjoin(NIBABEL_TEST_DATA, 'example_nifti2.nii.gz')
@@ -48,24 +44,28 @@ def test_read_nifti2():
         filemap[k].fileobj = io.open(NIFTI2_DATA)
     assert_raises(ValueError, ci.Cifti2Image.from_file_map, filemap)
 
+
 @needs_nibabel_data('nitest-cifti2')
 def test_read_internal():
     img2 = ci.load(DATA_FILE6)
     assert_true(isinstance(img2.header, ci.Cifti2Header))
     assert_equal(img2.shape, (1, 91282))
 
+
 @needs_nibabel_data('nitest-cifti2')
 def test_read():
     img2 = nib.load(DATA_FILE6)
     assert_true(isinstance(img2.header, ci.Cifti2Header))
     assert_equal(img2.shape, (1, 91282))
 
+
 @needs_nibabel_data('nitest-cifti2')
 def test_version():
     for i, dat in enumerate(datafiles):
         img = nib.load(dat)
         assert_equal(LooseVersion(img.header.version), LooseVersion('2'))
 
+
 @needs_nibabel_data('nitest-cifti2')
 def test_readwritedata():
     with InTemporaryDirectory():
@@ -78,8 +78,10 @@ def test_readwritedata():
             # Order should be preserved in load/save
             for mim1, mim2 in zip(img.header.matrix,
                                   img2.header.matrix):
-                named_maps1 = [m_ for m_ in mim1 if isinstance(m_, ci.Cifti2NamedMap)]
-                named_maps2 = [m_ for m_ in mim2 if isinstance(m_, ci.Cifti2NamedMap)]
+                named_maps1 = [m_ for m_ in mim1
+                               if isinstance(m_, ci.Cifti2NamedMap)]
+                named_maps2 = [m_ for m_ in mim2
+                               if isinstance(m_, ci.Cifti2NamedMap)]
                 assert_equal(len(named_maps1), len(named_maps2))
                 for map1, map2 in zip(named_maps1, named_maps2):
                     assert_equal(map1.map_name, map2.map_name)
@@ -103,8 +105,10 @@ def test_nibabel_readwritedata():
             # Order should be preserved in load/save
             for mim1, mim2 in zip(img.header.matrix,
                                   img2.header.matrix):
-                named_maps1 = [m_ for m_ in mim1 if isinstance(m_, ci.Cifti2NamedMap)]
-                named_maps2 = [m_ for m_ in mim2 if isinstance(m_, ci.Cifti2NamedMap)]
+                named_maps1 = [m_ for m_ in mim1
+                               if isinstance(m_, ci.Cifti2NamedMap)]
+                named_maps2 = [m_ for m_ in mim2
+                               if isinstance(m_, ci.Cifti2NamedMap)]
                 assert_equal(len(named_maps1), len(named_maps2))
                 for map1, map2 in zip(named_maps1, named_maps2):
                     assert_equal(map1.map_name, map2.map_name)
@@ -148,15 +152,17 @@ def test_cifti2types():
                     counter[ci.Cifti2BrainModel] += 1
                     if isinstance(map_.vertex_indices, ci.Cifti2VertexIndices):
                         counter[ci.Cifti2VertexIndices] += 1
-                    if isinstance(map_.voxel_indices_ijk, ci.Cifti2VoxelIndicesIJK):
+                    if isinstance(map_.voxel_indices_ijk,
+                                  ci.Cifti2VoxelIndicesIJK):
                         counter[ci.Cifti2VoxelIndicesIJK] += 1
                 elif isinstance(map_, ci.Cifti2NamedMap):
                     counter[ci.Cifti2NamedMap] += 1
                     assert_true(isinstance(map_.metadata, ci.Cifti2MetaData))
                     if isinstance(map_.label_table, ci.Cifti2LabelTable):
                         counter[ci.Cifti2LabelTable] += 1
                         for label in map_.label_table:
-                            assert_true(isinstance(map_.label_table[label], ci.Cifti2Label))
+                            assert_true(isinstance(map_.label_table[label],
+                                                   ci.Cifti2Label))
                             counter[ci.Cifti2Label] += 1
                 elif isinstance(map_, ci.Cifti2Parcel):
                     counter[ci.Cifti2Parcel] += 1
@@ -175,11 +181,16 @@ def test_cifti2types():
                                   ci.Cifti2TransformationMatrixVoxelIndicesIJKtoXYZ):
                         counter[ci.Cifti2TransformationMatrixVoxelIndicesIJKtoXYZ] += 1
 
-            assert_equal(list(mim.named_maps), [m_ for m_ in mim if isinstance(m_, ci.Cifti2NamedMap)])
-            assert_equal(list(mim.surfaces), [m_ for m_ in mim if isinstance(m_, ci.Cifti2Surface)])
-            assert_equal(list(mim.parcels), [m_ for m_ in mim if isinstance(m_, ci.Cifti2Parcel)])
-            assert_equal(list(mim.brain_models), [m_ for m_ in mim if isinstance(m_, ci.Cifti2BrainModel)])
-            assert_equal([mim.volume] if mim.volume else [], [m_ for m_ in mim if isinstance(m_, ci.Cifti2Volume)])
+            assert_equal(list(mim.named_maps),
+                         [m_ for m_ in mim if isinstance(m_, ci.Cifti2NamedMap)])
+            assert_equal(list(mim.surfaces),
+                         [m_ for m_ in mim if isinstance(m_, ci.Cifti2Surface)])
+            assert_equal(list(mim.parcels),
+                         [m_ for m_ in mim if isinstance(m_, ci.Cifti2Parcel)])
+            assert_equal(list(mim.brain_models),
+                         [m_ for m_ in mim if isinstance(m_, ci.Cifti2BrainModel)])
+            assert_equal([mim.volume] if mim.volume else [],
+                         [m_ for m_ in mim if isinstance(m_, ci.Cifti2Volume)])
 
     for klass, count in counter.items():
         assert_true(count > 0, "No exercise of " + klass.__name__)