Renamed CIFTI2HeaderError to Cifti2HeaderError

Author: demianw

nibabel/cifti2/__init__.py

@@ -24,4 +24,4 @@
                      Cifti2Surface,
                      Cifti2TransformationMatrixVoxelIndicesIJKtoXYZ,
                      Cifti2Vertices, Cifti2Volume, CIFTI_BRAIN_STRUCTURES,
-                     CIFTI2HeaderError, CIFTI_MODEL_TYPES, load, save)
+                     Cifti2HeaderError, CIFTI_MODEL_TYPES, load, save)

nibabel/cifti2/cifti2.py

@@ -37,7 +37,7 @@ def _float_01(val):
     return out
 
 
-class CIFTI2HeaderError(Exception):
+class Cifti2HeaderError(Exception):
     """ Error in CIFTI2 header
     """
 
@@ -224,7 +224,7 @@ def __iter__(self):
 
     def _to_xml_element(self):
         if len(self) == 0:
-            raise CIFTI2HeaderError('LabelTable element requires at least 1 label')
+            raise Cifti2HeaderError('LabelTable element requires at least 1 label')
         labeltable = xml.Element('LabelTable')
         for ele in self._labels.values():
             labeltable.append(ele._to_xml_element())
@@ -284,16 +284,16 @@ def rgba(self):
 
     def _to_xml_element(self):
         if self.label is '':
-            raise CIFTI2HeaderError('Label needs a name')
+            raise Cifti2HeaderError('Label needs a name')
         try:
             v = int(self.key)
         except ValueError:
-            raise CIFTI2HeaderError('The key must be an integer')
+            raise Cifti2HeaderError('The key must be an integer')
         for c_ in ('red', 'blue', 'green', 'alpha'):
             try:
                 v = _float_01(getattr(self, c_))
             except ValueError:
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Label invalid %s needs to be a float between 0 and 1. '
                     'and it is %s' % (c_, v)
                 )
@@ -420,7 +420,7 @@ def __init__(self, brain_structure=None, surface_number_of_vertices=None):
 
     def _to_xml_element(self):
         if self.brain_structure is None:
-            raise CIFTI2HeaderError('Surface element requires at least 1 BrainStructure')
+            raise Cifti2HeaderError('Surface element requires at least 1 BrainStructure')
         surf = xml.Element('Surface')
         surf.attrib['BrainStructure'] = str(self.brain_structure)
         surf.attrib['SurfaceNumberOfVertices'] = str(self.surface_number_of_vertices)
@@ -501,7 +501,7 @@ def insert(self, index, value):
 
     def _to_xml_element(self):
         if len(self) == 0:
-            raise CIFTI2HeaderError('VoxelIndicesIJK element require an index table')
+            raise Cifti2HeaderError('VoxelIndicesIJK element require an index table')
 
         vox_ind = xml.Element('VoxelIndicesIJK')
         vox_ind.text = '\n'.join(' '.join([str(v) for v in row])
@@ -566,7 +566,7 @@ def insert(self, index, value):
 
     def _to_xml_element(self):
         if self.brain_structure is None:
-            raise CIFTI2HeaderError('Vertices element require a BrainStructure')
+            raise Cifti2HeaderError('Vertices element require a BrainStructure')
 
         vertices = xml.Element('Vertices')
         vertices.attrib['BrainStructure'] = str(self.brain_structure)
@@ -631,7 +631,7 @@ def pop_cifti2_vertices(self, ith):
 
     def _to_xml_element(self):
         if self.name is None:
-            raise CIFTI2HeaderError('Parcel element requires a name')
+            raise Cifti2HeaderError('Parcel element requires a name')
 
         parcel = xml.Element('Parcel')
         parcel.attrib['Name'] = str(self.name)
@@ -676,7 +676,7 @@ def __init__(self, meter_exponent=None, matrix=None):
 
     def _to_xml_element(self):
         if self.matrix is None:
-            raise CIFTI2HeaderError(
+            raise Cifti2HeaderError(
                 'TransformationMatrixVoxelIndicesIJKtoXYZ element requires a matrix'
             )
         trans = xml.Element('TransformationMatrixVoxelIndicesIJKtoXYZ')
@@ -720,7 +720,7 @@ def __init__(self, volume_dimensions=None, transform_matrix=None):
 
     def _to_xml_element(self):
         if self.volume_dimensions is None:
-            raise CIFTI2HeaderError('Volume element requires dimensions')
+            raise Cifti2HeaderError('Volume element requires dimensions')
 
         volume = xml.Element('Volume')
         volume.attrib['VolumeDimensions'] = ','.join(
@@ -777,7 +777,7 @@ def insert(self, index, value):
 
     def _to_xml_element(self):
         if len(self) == 0:
-            raise CIFTI2HeaderError('VertexIndices element requires indices')
+            raise Cifti2HeaderError('VertexIndices element requires indices')
 
         vert_indices = xml.Element('VertexIndices')
         vert_indices.text = ' '.join([str(i) for i in self])
@@ -987,15 +987,15 @@ def __setitem__(self, index, value):
                 not isinstance(self._maps[index], Cifti2Volume)
             )
         ):
-            raise CIFTI2HeaderError("Only one Volume can be in a MatrixIndicesMap")
+            raise Cifti2HeaderError("Only one Volume can be in a MatrixIndicesMap")
         self._maps[index] = value
 
     def insert(self, index, value):
         if (
             isinstance(value, Cifti2Volume) and
             self.volume is not None
         ):
-            raise CIFTI2HeaderError("Only one Volume can be in a MatrixIndicesMap")
+            raise Cifti2HeaderError("Only one Volume can be in a MatrixIndicesMap")
 
         self._maps.insert(index, value)
 
@@ -1053,7 +1053,7 @@ def brain_models(self):
 
     def _to_xml_element(self):
         if self.applies_to_matrix_dimension is None:
-            raise CIFTI2HeaderError(
+            raise Cifti2HeaderError(
                 'MatrixIndicesMap element requires to be applied to at least 1 dimension'
             )
 

nibabel/cifti2/parse_cifti2.py

@@ -18,7 +18,7 @@
                      Cifti2MatrixIndicesMap, Cifti2NamedMap, Cifti2Parcel,
                      Cifti2Surface, Cifti2TransformationMatrixVoxelIndicesIJKtoXYZ,
                      Cifti2Vertices, Cifti2Volume, CIFTI_BRAIN_STRUCTURES,
-                     CIFTI_MODEL_TYPES, _underscore, CIFTI2HeaderError)
+                     CIFTI_MODEL_TYPES, _underscore, Cifti2HeaderError)
 from .. import xmlutils as xml
 from ..spatialimages import HeaderDataError
 from ..externals.six import BytesIO
@@ -186,7 +186,7 @@ def StartElementHandler(self, name, attrs):
             matrix = Cifti2Matrix()
             parent = self.struct_state[-1]
             if not isinstance(parent, Cifti2Header):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Matrix element can only be a child of the CIFTI2 Header element'
                 )
             parent.matrix = matrix
@@ -197,7 +197,7 @@ def StartElementHandler(self, name, attrs):
             meta = Cifti2MetaData()
             parent = self.struct_state[-1]
             if not isinstance(parent, (Cifti2Matrix, Cifti2NamedMap)):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'MetaData element can only be a child of the CIFTI2 Matrix or NamedMap elements'
                 )
 
@@ -229,7 +229,7 @@ def StartElementHandler(self, name, attrs):
                     setattr(mim, _underscore(key), dtype(attrs[key]))
             matrix = self.struct_state[-1]
             if not isinstance(matrix, Cifti2Matrix):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'MatrixIndicesMap element can only be a child of the CIFTI2 Matrix element'
                 )
             matrix.append(mim)
@@ -240,7 +240,7 @@ def StartElementHandler(self, name, attrs):
             named_map = Cifti2NamedMap()
             mim = self.struct_state[-1]
             if not isinstance(mim, Cifti2MatrixIndicesMap):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'NamedMap element can only be a child of the CIFTI2 MatrixIndicesMap element'
                 )
             self.struct_state.append(named_map)
@@ -250,13 +250,13 @@ def StartElementHandler(self, name, attrs):
             named_map = self.struct_state[-1]
             mim = self.struct_state[-2]
             if mim.indices_map_to_data_type != "CIFTI_INDEX_TYPE_LABELS":
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'LabelTable element can only be a child of a MatrixIndicesMap '
                     'with CIFTI_INDEX_TYPE_LABELS type'
                 )
             lata = Cifti2LabelTable()
             if not isinstance(named_map, Cifti2NamedMap):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'LabelTable element can only be a child of the CIFTI2 NamedMap element'
                 )
             self.fsm_state.append('LabelTable')
@@ -266,7 +266,7 @@ def StartElementHandler(self, name, attrs):
         elif name == 'Label':
             lata = self.struct_state[-1]
             if not isinstance(lata, Cifti2LabelTable):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Label element can only be a child of the CIFTI2 LabelTable element'
                 )
             label = Cifti2Label()
@@ -282,7 +282,7 @@ def StartElementHandler(self, name, attrs):
         elif name == "MapName":
             named_map = self.struct_state[-1]
             if not isinstance(named_map, Cifti2NamedMap):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'MapName element can only be a child of the CIFTI2 NamedMap element'
                 )
 
@@ -293,11 +293,11 @@ def StartElementHandler(self, name, attrs):
             surface = Cifti2Surface()
             mim = self.struct_state[-1]
             if not isinstance(mim, Cifti2MatrixIndicesMap):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Surface element can only be a child of the CIFTI2 MatrixIndicesMap element'
                 )
             if mim.indices_map_to_data_type != "CIFTI_INDEX_TYPE_PARCELS":
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Surface element can only be a child of a MatrixIndicesMap '
                     'with CIFTI_INDEX_TYPE_PARCELS type'
                 )
@@ -309,7 +309,7 @@ def StartElementHandler(self, name, attrs):
             parcel = Cifti2Parcel()
             mim = self.struct_state[-1]
             if not isinstance(mim, Cifti2MatrixIndicesMap):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Parcel element can only be a child of the CIFTI2 MatrixIndicesMap element'
                 )
             parcel.name = attrs["Name"]
@@ -321,12 +321,12 @@ def StartElementHandler(self, name, attrs):
             vertices = Cifti2Vertices()
             parcel = self.struct_state[-1]
             if not isinstance(parcel, Cifti2Parcel):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Vertices element can only be a child of the CIFTI2 Parcel element'
                 )
             vertices.brain_structure = attrs["BrainStructure"]
             if vertices.brain_structure not in CIFTI_BRAIN_STRUCTURES:
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'BrainStructure for this Vertices element is not valid'
                 )
             parcel.append_cifti_vertices(vertices)
@@ -337,7 +337,7 @@ def StartElementHandler(self, name, attrs):
         elif name == "VoxelIndicesIJK":
             parent = self.struct_state[-1]
             if not isinstance(parent, (Cifti2Parcel, Cifti2BrainModel)):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'VoxelIndicesIJK element can only be a child of the CIFTI2 '
                     'Parcel or BrainModel elements'
                 )
@@ -347,7 +347,7 @@ def StartElementHandler(self, name, attrs):
         elif name == "Volume":
             mim = self.struct_state[-1]
             if not isinstance(mim, Cifti2MatrixIndicesMap):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'Volume element can only be a child of the CIFTI2 MatrixIndicesMap element'
                 )
             dimensions = tuple([int(val) for val in
@@ -360,7 +360,7 @@ def StartElementHandler(self, name, attrs):
         elif name == "TransformationMatrixVoxelIndicesIJKtoXYZ":
             volume = self.struct_state[-1]
             if not isinstance(volume, Cifti2Volume):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'TransformationMatrixVoxelIndicesIJKtoXYZ element can only be a child '
                     'of the CIFTI2 Volume element'
                 )
@@ -375,12 +375,12 @@ def StartElementHandler(self, name, attrs):
             model = Cifti2BrainModel()
             mim = self.struct_state[-1]
             if not isinstance(mim, Cifti2MatrixIndicesMap):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'BrainModel element can only be a child '
                     'of the CIFTI2 MatrixIndicesMap element'
                 )
             if mim.indices_map_to_data_type != "CIFTI_INDEX_TYPE_BRAIN_MODELS":
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'BrainModel element can only be a child of a MatrixIndicesMap '
                     'with CIFTI_INDEX_TYPE_BRAIN_MODELS type'
                 )
@@ -392,11 +392,11 @@ def StartElementHandler(self, name, attrs):
                 if key in attrs:
                     setattr(model, _underscore(key), dtype(attrs[key]))
             if model.brain_structure not in CIFTI_BRAIN_STRUCTURES:
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'BrainStructure for this BrainModel element is not valid'
                 )
             if model.model_type not in CIFTI_MODEL_TYPES:
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'ModelType for this BrainModel element is not valid'
                 )
             mim.append(model)
@@ -407,7 +407,7 @@ def StartElementHandler(self, name, attrs):
             index = Cifti2VertexIndices()
             model = self.struct_state[-1]
             if not isinstance(model, Cifti2BrainModel):
-                raise CIFTI2HeaderError(
+                raise Cifti2HeaderError(
                     'VertexIndices element can only be a child '
                     'of the CIFTI2 BrainModel element'
                 )