ValueError=>TypeError

Author: Ben Cipollini

nibabel/gifti/gifti.py

@@ -155,6 +155,7 @@ def rgba(self, rgba):
             raise ValueError('rgba must be length 4.')
         self.red, self.green, self.blue, self.alpha = rgba
 
+
 def _arr2txt(arr, elem_fmt):
     arr = np.asarray(arr)
     assert arr.dtype.names is None
@@ -404,7 +405,7 @@ def labeltable(self, labeltable):
 
         """
         if not isinstance(labeltable, GiftiLabelTable):
-            raise ValueError("Not a valid GiftiLabelTable instance")
+            raise TypeError("Not a valid GiftiLabelTable instance")
         self._labeltable = labeltable
 
     @np.deprecate_with_doc("Use the gifti_img.labeltable property instead.")
@@ -432,7 +433,7 @@ def meta(self, meta):
         None
         """
         if not isinstance(meta, GiftiMetaData):
-            raise ValueError("Not a valid GiftiMetaData instance")
+            raise TypeError("Not a valid GiftiMetaData instance")
         self._meta = meta
 
     @np.deprecate_with_doc("Use the gifti_img.labeltable property instead.")
@@ -450,10 +451,9 @@ def add_gifti_data_array(self, dataarr):
         ----------
         dataarr : GiftiDataArray
         """
-        if isinstance(dataarr, GiftiDataArray):
-            self.darrays.append(dataarr)
-        else:
-            raise ValueError("dataarr paramater must be of type GiftiDataArray")
+        if not isinstance(dataarr, GiftiDataArray):
+            raise TypeError("dataarr paramater must be of type GiftiDataArray")
+        self.darrays.append(dataarr)
 
     def remove_gifti_data_array(self, ith):
         """ Removes the ith data array element from the GiftiImage """

nibabel/gifti/tests/test_gifti.py

@@ -83,7 +83,7 @@ def test_labeltable():
     # Try to set to non-table
     def assign_labeltable(val):
         img.labeltable = val
-    assert_raises(ValueError, assign_labeltable, 'not-a-table')
+    assert_raises(TypeError, assign_labeltable, 'not-a-table')
 
 
 def test_metadata():
@@ -156,4 +156,4 @@ def test_gifti_image():
     assert_true(img.meta is not None)
     assert_true(img.labeltable is not None)
 
-    assert_raises(ValueError, img.add_gifti_data_array, 'not-a-data-array')
+    assert_raises(TypeError, img.add_gifti_data_array, 'not-a-data-array')