Merge pull request #2082 from mwaskom/selectfiles_parse

ENH: Parse SelectFiles format keys to allow attribute access

Author: effigies

nipype/interfaces/io.py

@@ -1256,8 +1256,10 @@ def __init__(self, templates, **kwargs):
         infields = []
         for name, template in list(templates.items()):
             for _, field_name, _, _ in string.Formatter().parse(template):
-                if field_name is not None and field_name not in infields:
-                    infields.append(field_name)
+                if field_name is not None:
+                    field_name = re.match("\w+", field_name).group()
+                    if field_name not in infields:
+                        infields.append(field_name)
 
         self._infields = infields
         self._outfields = list(templates)

nipype/interfaces/tests/test_io.py

@@ -11,6 +11,7 @@
 import os.path as op
 from subprocess import Popen
 import hashlib
+from collections import namedtuple
 
 import pytest
 import nipype
@@ -62,6 +63,7 @@ def test_s3datagrabber():
 templates1 = {"model": "interfaces/{package}/model.py",
              "preprocess": "interfaces/{package}/pre*.py"}
 templates2 = {"converter": "interfaces/dcm{to!s}nii.py"}
+templates3 = {"model": "interfaces/{package.name}/model.py"}
 
 @pytest.mark.parametrize("SF_args, inputs_att, expected", [
         ({"templates":templates1}, {"package":"fsl"},
@@ -75,6 +77,11 @@ def test_s3datagrabber():
 
         ({"templates":templates2}, {"to":2},
          {"infields":["to"], "outfields":["converter"], "run_output":{"converter":op.join(op.dirname(nipype.__file__), "interfaces/dcm2nii.py")}, "node_output":["converter"]}),
+
+        ({"templates": templates3}, {"package": namedtuple("package", ["name"])("fsl")},
+        {"infields": ["package"], "outfields": ["model"],
+         "run_output": {"model": op.join(op.dirname(nipype.__file__), "interfaces/fsl/model.py")},
+         "node_output": ["model"]}),
         ])
 def test_selectfiles(SF_args, inputs_att, expected):
     base_dir = op.dirname(nipype.__file__)