Make GIFTI call superclass __init__

Author: Ben Cipollini

nibabel/gifti/gifti.py

@@ -386,11 +386,15 @@ def metadata(self):
 
 
 class GiftiImage(FileBasedImage, xml.XmlSerializable):
+    valid_exts = ('.gii',)
     files_types = (('image', '.gii'),)
     valid_exts = ('.gii',)
 
-    def __init__(self, meta=None, labeltable=None, darrays=None,
-                 version="1.0"):
+    def __init__(self, header=None, extra=None, file_map=None, meta=None,
+                 labeltable=None, darrays=None, version="1.0"):
+        FileBasedImage.__init__(self, header=header, extra=extra,
+                                file_map=file_map)
+
         if darrays is None:
             darrays = []
         if meta is None:

nibabel/tests/test_files_interface.py

@@ -15,17 +15,20 @@
 from .. import Nifti1Image, Nifti1Pair, MGHImage, all_image_classes
 from ..externals.six import BytesIO
 from ..fileholders import FileHolderError
+from ..spatialimages import SpatialImage
 
 from nose.tools import (assert_true, assert_false, assert_equal, assert_raises)
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 
 
-def test_files_images():
+def test_files_spatialimages():
     # test files creation in image classes
     arr = np.zeros((2,3,4))
     aff = np.eye(4)
-    for klass in all_image_classes:
+    klasses = [klass for klass in all_image_classes
+               if klass.rw and issubclass(klass, SpatialImage)]
+    for klass in klasses:
         file_map = klass.make_file_map()
         for key, value in file_map.items():
             assert_equal(value.filename, None)
@@ -81,11 +84,12 @@ def test_files_interface():
     assert_array_equal(img2.get_data(), img.get_data())
 
 
-def test_round_trip():
+def test_round_trip_spatialimages():
     # write an image to files
     data = np.arange(24, dtype='i4').reshape((2, 3, 4))
     aff = np.eye(4)
-    klasses = filter(lambda klass: klass.rw, all_image_classes)
+    klasses = [klass for klass in all_image_classes
+               if klass.rw and issubclass(klass, SpatialImage)]
     for klass in klasses:
         file_map = klass.make_file_map()
         for key in file_map:

nibabel/tests/test_image_load_save.py

@@ -27,6 +27,7 @@
 from ..tmpdirs import InTemporaryDirectory
 from ..volumeutils import native_code, swapped_code
 from ..optpkg import optional_package
+from ..spatialimages import SpatialImage
 
 from numpy.testing import assert_array_equal, assert_array_almost_equal
 from nose.tools import assert_true, assert_equal
@@ -45,17 +46,19 @@ def round_trip(img):
     return img2
 
 
-def test_conversion():
+def test_conversion_spatialimages():
     shape = (2, 4, 6)
     affine = np.diag([1, 2, 3, 1])
+    klasses = [klass for klass in all_image_classes
+               if klass.rw and issubclass(klass, SpatialImage)]
     for npt in np.float32, np.int16:
         data = np.arange(np.prod(shape), dtype=npt).reshape(shape)
-        for r_class in all_image_classes:
+        for r_class in klasses:
             if not r_class.makeable:
                 continue
             img = r_class(data, affine)
             img.set_data_dtype(npt)
-            for w_class in all_image_classes:
+            for w_class in klasses:
                 if not w_class.makeable:
                     continue
                 img2 = w_class.from_image(img)