TEST: fixed comments

Author: robbisg

nibabel/cifti2/tests/test_cifti2.py

@@ -140,17 +140,17 @@ def test_cifti2_label():
     lb.label = 'Test'
     lb.key = 0
     assert lb.rgba == (0, 0, 0, 0)
-    assert compare_xml_leaf(lb.to_xml().decode('utf-8'), "<Label Key='0' Red='0' Green='0' Blue='0' Alpha='0'>Test</Label>")
+    assert compare_xml_leaf(lb.to_xml().decode('utf-8'), 
+                            "<Label Key='0' Red='0' Green='0' Blue='0' Alpha='0'>Test</Label>")
 
     lb.red = 0
     lb.green = 0.1
     lb.blue = 0.2
     lb.alpha = 0.3
     assert lb.rgba == (0, 0.1, 0.2, 0.3)
 
-    assert compare_xml_leaf(
-                lb.to_xml().decode('utf-8'),
-                "<Label Key='0' Red='0' Green='0.1' Blue='0.2' Alpha='0.3'>Test</Label>")
+    assert compare_xml_leaf(lb.to_xml().decode('utf-8'),
+                            "<Label Key='0' Red='0' Green='0.1' Blue='0.2' Alpha='0.3'>Test</Label>")
 
     lb.red = 10
     with pytest.raises(ci.Cifti2HeaderError):
@@ -172,7 +172,7 @@ def test_cifti2_parcel():
         pl.append_cifti_vertices(None)
 
     with pytest.raises(ValueError):
-        ci.Cifti2Parcel(**{'vertices': [1, 2, 3]})
+        ci.Cifti2Parcel(vertices=[1, 2, 3])
 
     pl = ci.Cifti2Parcel(name='region',
                          voxel_indices_ijk=ci.Cifti2VoxelIndicesIJK([[1, 2, 3]]),
@@ -296,10 +296,10 @@ def test_cifti2_voxelindicesijk():
         # Don't know how to use remove with slice
         del vi[:, 0] 
     with pytest.raises(ValueError):
-        vi[(0, 0, 0)]
+        vi[0, 0, 0]
 
     with pytest.raises(ValueError):
-        vi[(0, 0, 0)] = 0
+        vi[0, 0, 0] = 0
 
     assert vi.to_xml().decode('utf-8') == '<VoxelIndicesIJK>0 1 2\n3 4 6</VoxelIndicesIJK>'
 
@@ -334,22 +334,22 @@ def test_matrixindicesmap():
     del mim.volume
     assert mim.volume is None
     with pytest.raises(ValueError):
-        delattr(mim, 'volume')
+        del mim.volume
 
     mim.volume = volume
     assert mim.volume == volume
     mim.volume = volume2
     assert mim.volume == volume2
 
     with pytest.raises(ValueError):
-        setattr(mim, 'volume', parcel)
+        mim.volume = parcel
 
 
 def test_matrix():
     m = ci.Cifti2Matrix()
 
-    with pytest.raises(TypeError):
-        m(setattr, 'metadata', ci.Cifti2Parcel())
+    with pytest.raises(ValueError):
+        m.metadata = ci.Cifti2Parcel()
 
     with pytest.raises(TypeError):
         m[0] = ci.Cifti2Parcel()

nibabel/cifti2/tests/test_cifti2io_header.py

@@ -75,7 +75,7 @@ def test_read_and_proxies():
 def test_version():
     for i, dat in enumerate(datafiles):
         img = nib.load(dat)
-        assert LooseVersion(img.header.version), LooseVersion('2')
+        assert LooseVersion(img.header.version) == LooseVersion('2')
 
 
 @needs_nibabel_data('nitest-cifti2')
@@ -193,10 +193,10 @@ def test_cifti2types():
             assert list(mim.surfaces) == [m_ for m_ in mim if isinstance(m_, ci.Cifti2Surface)]
             assert list(mim.parcels) == [m_ for m_ in mim if isinstance(m_, ci.Cifti2Parcel)]
             assert list(mim.brain_models) == [m_ for m_ in mim if isinstance(m_, ci.Cifti2BrainModel)]
-            assert [mim.volume] == [m_ for m_ in mim if isinstance(m_, ci.Cifti2Volume)] if mim.volume else [] 
+            assert ([mim.volume]  if mim.volume else []) == [m_ for m_ in mim if isinstance(m_, ci.Cifti2Volume)]
 
     for klass, count in counter.items():
-        assert count > 0 # "No exercise of " + klass.__name__
+        assert count > 0, "No exercise of " + klass.__name__
 
 
 @needs_nibabel_data('nitest-cifti2')
@@ -246,7 +246,7 @@ def test_read_geometry():
             assert from_file.surface_number_of_vertices is None
             assert len(from_file.voxel_indices_ijk) == expected[1]
             assert from_file.voxel_indices_ijk[0] == expected[2]
-            assert from_file.voxel_indices_ijk[-1], expected[3]
+            assert from_file.voxel_indices_ijk[-1] == expected[3]
     assert current_index == img.shape[1]
 
     expected_affine = [[-2, 0, 0,   90],
@@ -352,7 +352,7 @@ def test_read_scalar():
             assert key in scalar.metadata.data.keys()
             assert scalar.metadata[key][:len(value)] == value
 
-        assert scalar.label_table is None #".dscalar file should not define a label table"
+        assert scalar.label_table is None, ".dscalar file should not define a label table"
 
 
 @needs_nibabel_data('nitest-cifti2')
@@ -433,7 +433,7 @@ def test_pixdim_log_checks(self):
         hdr = HC()
         hdr['pixdim'][1] = -2  # severity 35
         fhdr, message, raiser = self.log_chk(hdr, 35)
-        assert fhdr['pixdim'][1]== 2
+        assert fhdr['pixdim'][1] == 2
         assert message == self._pixdim_message + '; setting to abs of pixdim values'
 
         pytest.raises(*raiser)