Merge remote-tracking branch 'mfalkiewicz/fix/fsl_GLM'

Author: chrisgorgo

nipype/interfaces/fsl/model.py

@@ -1702,7 +1702,7 @@ def _list_outputs(self):
 class GLMInputSpec(FSLCommandInputSpec):
     in_file = File(exists=True, argstr='-i %s', mandatory=True, position=1,
                    desc='input file name (text matrix or 3D/4D image file)')
-    out_file = File(name_template="%s_glm.txt", argstr='-o %s', position=3,
+    out_file = File(name_template="%s_glm", argstr='-o %s', position=3,
                     desc=('filename for GLM parameter estimates'
                           + ' (GLM betas)'),
                     name_source="in_file", keep_extension=True)
@@ -1809,13 +1809,7 @@ class GLM(FSLCommand):
     output_spec = GLMOutputSpec
 
     def _list_outputs(self):
-        outputs = self.output_spec().get()
-
-        outputs['out_file'] = self.inputs.out_file
-        # Generate an out_file if one is not provided
-        if not isdefined(outputs['out_file']) and isdefined(self.inputs.in_file):
-            outputs['out_file'] = self._gen_filename('out_file')
-        outputs['out_file'] = os.path.abspath(outputs['out_file'])
+        outputs = super(GLM, self)._list_outputs()
 
         if isdefined(self.inputs.out_cope):
             outputs['out_cope'] = os.path.abspath(self.inputs.out_cope)