corrections, pep8 check and test_auto_Normalize12.py

Author: miykael

nipype/interfaces/spm/__init__.py

@@ -4,12 +4,11 @@
 
 from .base import (Info, SPMCommand, logger, no_spm, scans_for_fname,
                    scans_for_fnames)
-from .preprocess import (SliceTiming, Realign, Coregister, Normalize, Normalize12,
-                         Segment, Smooth, NewSegment, DARTEL, DARTELNorm2MNI,
-                         CreateWarped, VBMSegment)
+from .preprocess import (SliceTiming, Realign, Coregister, Normalize,
+                         Normalize12, Segment, Smooth, NewSegment, DARTEL,
+                         DARTELNorm2MNI, CreateWarped, VBMSegment)
 from .model import (Level1Design, EstimateModel, EstimateContrast, Threshold,
                     OneSampleTTestDesign, TwoSampleTTestDesign,
                     PairedTTestDesign, MultipleRegressionDesign)
 from .utils import (Analyze2nii, CalcCoregAffine, ApplyTransform, Reslice,
-                    ApplyInverseDeformation,ResliceToReference,DicomImport)
-
+                    ApplyInverseDeformation, ResliceToReference, DicomImport)

nipype/interfaces/spm/base.py

@@ -467,7 +467,7 @@ def _make_matlab_command(self, contents, postscript=None):
         fprintf('SPM path: %s\\n', which('spm'));
         spm('Defaults','fMRI');
 
-        if strcmp(name, 'SPM8') || strcmp(name, 'SPM12'),
+        if strcmp(name, 'SPM8') || strcmp(name(1:5), 'SPM12'),
            spm_jobman('initcfg');
            spm_get_defaults('cmdline', 1);
         end\n
@@ -502,7 +502,7 @@ def _make_matlab_command(self, contents, postscript=None):
         """
         if self.inputs.use_mcr:
             mscript += """
-        if strcmp(name, 'SPM8') || strcmp(name, 'SPM12'),
+        if strcmp(name, 'SPM8') || strcmp(name(1:5), 'SPM12'),
             close(\'all\', \'force\');
         end;
             """