Base GiftiImage on XmlBasedImage

Author: Ben Cipollini

nibabel/gifti/gifti.py

@@ -13,7 +13,6 @@
 import numpy as np
 
 from .. import xmlbasedimages as xml
-from ..filebasedimages import FileBasedImage
 from ..nifti1 import data_type_codes, xform_codes, intent_codes
 from .util import (array_index_order_codes, gifti_encoding_codes,
                    gifti_endian_codes, KIND2FMT)
@@ -386,14 +385,14 @@ def metadata(self):
         return self.meta.metadata
 
 
-class GiftiImage(FileBasedImage, xml.XmlSerializable):
+class GiftiImage(xml.XmlBasedImage):
     valid_exts = ('.gii',)
     files_types = (('image', '.gii'),)
 
     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)
+        super(GiftiImage, self).__init__(header=header, extra=extra,
+                                         file_map=file_map)
 
         if darrays is None:
             darrays = []

nibabel/xmlbasedimages.py

@@ -11,6 +11,8 @@
 """
 from xml.etree.ElementTree import Element, SubElement, tostring
 
+from .filebasedimages import FileBasedHeader, FileBasedImage
+
 
 class XmlSerializable(object):
     """ Basic interface for serializing an object to xml"""
@@ -23,3 +25,11 @@ def to_xml(self, enc='utf-8'):
         """ Output should be an xml string with the given encoding.
         (default: utf-8)"""
         return tostring(self._to_xml_element(), enc)
+
+
+class XmlBasedHeader(FileBasedHeader, XmlSerializable):
+    pass
+
+
+class XmlBasedImage(FileBasedImage, XmlSerializable):
+    pass