checking if iterfield is collections.sequence (not range only)

Author: djarecka

nipype/interfaces/base.py

@@ -32,6 +32,7 @@
 import simplejson as json
 from dateutil.parser import parse as parseutc
 from packaging.version import Version
+import collections
 
 from .. import config, logging, LooseVersion, __version__
 from ..utils.provenance import write_provenance
@@ -2063,7 +2064,10 @@ def validate(self, object, name, value):
             return Undefined
         newvalue = value
 
-        if not isinstance(value, list) \
+        if isinstance(value, collections.Sequence):
+            newvalue  = list(value)
+
+        if not isinstance(value, collections.Sequence) \
             or (self.inner_traits() and
                 isinstance(self.inner_traits()[0].trait_type,
                            traits.List) and not
@@ -2072,10 +2076,7 @@ def validate(self, object, name, value):
                 isinstance(value, list) and
                 value and not
                 isinstance(value[0], list)):
-            if isinstance(value, range):
-                newvalue = list(value)
-            else:
-                newvalue = [value]
+            newvalue = [value]
         value = super(MultiPath, self).validate(object, name, newvalue)
 
         if len(value) > 0:

nipype/pipeline/engine/tests/test_engine.py

@@ -457,7 +457,7 @@ def test_mapnode_iterfield_check():
 
 
 @pytest.mark.parametrize("x_inp, f_exp", [
-        (3, [9]), ([2, 3], [4, 9]), (range(3), [0, 1, 4])
+        (3, [9]), ([2, 3], [4, 9]), ((2,3), [4,9]), (range(3), [0, 1, 4])
         ])
 def test_mapnode_iterfield_type(x_inp, f_exp):
     from nipype import MapNode, Function