STY: pep8 updates

Author: Ben Cipollini

nibabel/cifti/cifti.py

@@ -25,7 +25,6 @@
 from ..externals import inflection
 from ..externals.six import string_types
 from ..filebasedimages import FileBasedImage, FileBasedHeader
-from ..nifti1 import Nifti1Extension
 from ..nifti2 import Nifti2Image
 
 
@@ -464,7 +463,6 @@ def vertex_indices(self, value):
     def _to_xml_element(self):
         brain_model = xml.Element('BrainModel')
 
-        attrs = []
         for key in ['IndexOffset', 'IndexCount', 'ModelType', 'BrainStructure',
                     'SurfaceNumberOfVertices']:
             attr = inflection.underscore(key)
@@ -593,7 +591,7 @@ def remove_cifti_volume(self):
 
     def _to_xml_element(self):
         assert self.applies_to_matrix_dimension is not None
-        attrs = []
+
         mat_ind_map = xml.Element('MatrixIndicesMap')
         for key in ['AppliesToMatrixDimension', 'IndicesMapToDataType',
                     'NumberOfSeriesPoints', 'SeriesExponent', 'SeriesStart',
@@ -739,9 +737,10 @@ def from_file_map(klass, file_map):
         nifti_img = _CiftiAsNiftiImage.from_file_map(file_map)
 
         # Get cifti header
-        cifti_header = reduce(lambda accum, item: item.get_content()
-                                  if isinstance(item, CiftiExtension)
-                                  else accum,
+        cifti_header = reduce(lambda accum, item:
+                              item.get_content()
+                              if isinstance(item, CiftiExtension)
+                              else accum,
                               nifti_img.get_header().extensions or [],
                               None)
         if cifti_header is None:

nibabel/cifti/parse_cifti_fast.py

@@ -9,18 +9,16 @@
 from __future__ import division, print_function, absolute_import
 
 from distutils.version import LooseVersion
-from xml.parsers.expat import ParserCreate, ExpatError
 
 import numpy as np
 
-from .cifti import (CiftiImage, CiftiHeader, CiftiMetaData, CiftiLabel,
+from .cifti import (CiftiHeader, CiftiMetaData, CiftiLabel,
                     CiftiLabelTable, CiftiVertexIndices,
                     CiftiVoxelIndicesIJK, CiftiBrainModel, CiftiMatrix,
                     CiftiMatrixIndicesMap, CiftiNamedMap, CiftiParcel,
                     CiftiSurface, CiftiTransformationMatrixVoxelIndicesIJKtoXYZ,
                     CiftiVertices, CiftiVolume, CIFTI_BrainStructures,
-                    CIFTI_MODEL_TYPES,
-                    CiftiDenseDataSeries)
+                    CIFTI_MODEL_TYPES)  # CiftiDenseDataSeries
 from .. import xmlutils as xml
 from ..externals import inflection
 from ..externals.six import BytesIO
@@ -108,8 +106,8 @@ def __init__(self, dataobj, affine, header=None,
 
         # Get cifti header from extension
         self.cifti_img = reduce(lambda accum, newval: newval
-                                    if isinstance(newval, CiftiExtension)
-                                    else accum,
+                                if isinstance(newval, CiftiExtension)
+                                else accum,
                                 self.get_header().extensions, None)
         if self.cifti_img is None:
             raise ValueError('Nifti2 header does not contain a CIFTI '
@@ -175,8 +173,9 @@ def StartElementHandler(self, name, attrs):
 
         elif name == 'MatrixIndicesMap':
             self.fsm_state.append('MatrixIndicesMap')
-            mim = CiftiMatrixIndicesMap(applies_to_matrix_dimension=int(attrs["AppliesToMatrixDimension"]),
-                                        indices_map_to_data_type=attrs["IndicesMapToDataType"])
+            mim = CiftiMatrixIndicesMap(
+                applies_to_matrix_dimension=int(attrs["AppliesToMatrixDimension"]),
+                indices_map_to_data_type=attrs["IndicesMapToDataType"])
             for key, dtype in [("NumberOfSeriesPoints", int),
                                ("SeriesExponent", int),
                                ("SeriesStart", float),