Merge remote-tracking branch 'origin/pr/807'

Author: chrisgorgo

nipype/interfaces/base.py

@@ -1487,7 +1487,11 @@ def _filename_from_source(self, name):
             source = getattr(self.inputs, name_source)
             while isinstance(source, list):
                 source = source[0]
-            _, base, _ = split_filename(source)
+            #special treatment for files
+            if isinstance(source, str) and os.path.exists(source):
+                _, base, _ = split_filename(source)
+            else:
+                base = source
             retval = name_template % base
             _, _, ext = split_filename(retval)
             if trait_spec.keep_extension and ext:

nipype/interfaces/tests/test_base.py

@@ -11,7 +11,7 @@
 from nipype.utils.filemanip import split_filename
 from nipype.interfaces.base import Undefined, config
 from traits.testing.nose_tools import skip
-
+import traits.api as traits
 #test Bunch
 def test_bunch():
     b = nib.Bunch()
@@ -181,11 +181,15 @@ class spec2(nib.CommandLineInputSpec):
         moo = nib.File(name_source=['doo'], hash_files=False, argstr="%s",
                        position=2)
         doo = nib.File(exists=True, argstr="%s", position=1)
+        goo = traits.Int(argstr="%d", position=4)
+        poo = nib.File(name_source=['goo'], hash_files=False, argstr="%s",position=3)
+
     class TestName(nib.CommandLine):
         _cmd = "mycommand"
         input_spec = spec2
     testobj = TestName()
     testobj.inputs.doo = tmp_infile
+    testobj.inputs.goo = 99
     yield assert_true, '%s_generated' % nme in testobj.cmdline
     testobj.inputs.moo = "my_%s_template"
     yield assert_true, 'my_%s_template' % nme in testobj.cmdline