added test for sorting, fixed tuples

Author: chrisgorgo

nipype/interfaces/tests/test_io.py

@@ -180,12 +180,14 @@ def test_datafinder_copydir():
     from nipype.interfaces.io import DataFinder
     df = DataFinder()
     df.inputs.root_paths = outdir
-    df.inputs.match_regex = '.txt'
+    df.inputs.match_regex = '.+/(?P<basename>.+).txt'
     result = df.run()
     expected = ["findme.txt", "findmetoo.txt"]
     for path, expected_fname in zip(result.outputs.out_paths, expected):
-	_, fname = os.path.split(path)
-	yield assert_equal, fname, expected_fname
+        _, fname = os.path.split(path)
+        yield assert_equal, fname, expected_fname
+        
+    yield assert_equal, result.outputs.basename, ["findme", "findmetoo"]
 
     shutil.rmtree(outdir)
 

nipype/utils/misc.py

@@ -17,6 +17,8 @@ def atoi(text):
         return int(text) if text.isdigit() else text
 
     def natural_keys(text):
+        if isinstance(text,tuple):
+            text = text[0]
         return [ atoi(c) for c in re.split('(\d+)', text) ]
 
     return sorted(l, key=natural_keys)