ENH: Rename MultiPath -> MultiObject

Author: effigies

nipype/interfaces/base/__init__.py

@@ -18,7 +18,8 @@
 
 from .traits_extension import (
     traits, Undefined, TraitDictObject, TraitListObject, TraitError, isdefined,
-    File, Directory, Str, DictStrStr, has_metadata, ImageFile, MultiPath,
+    File, Directory, Str, DictStrStr, has_metadata, ImageFile,
+    OutputMultiObject, InputMultiObject,
     OutputMultiPath, InputMultiPath)
 
 from .support import (Bunch, InterfaceResult, load_template,

nipype/interfaces/base/traits_extension.py

@@ -315,8 +315,8 @@ def has_metadata(trait, metadata, value=None, recursive=True):
     return count > 0
 
 
-class MultiPath(traits.List):
-    """ Abstract class - shared functionality of input and output MultiPath
+class MultiObject(traits.List):
+    """ Abstract class - shared functionality of input and output MultiObject
     """
 
     def validate(self, object, name, value):
@@ -335,18 +335,18 @@ def validate(self, object, name, value):
         inner_trait = self.inner_traits()[0]
         if not isinstance(value, list) \
             or (isinstance(inner_trait.trait_type, traits.List) and
-                not isinstance(inner_trait.trait_type, InputMultiPath) and
+                not isinstance(inner_trait.trait_type, InputMultiObject) and
                 not isinstance(value[0], list)):
             newvalue = [value]
-        value = super(MultiPath, self).validate(object, name, newvalue)
+        value = super(MultiObject, self).validate(object, name, newvalue)
 
         if value:
             return value
 
         self.error(object, name, value)
 
 
-class OutputMultiPath(MultiPath):
+class OutputMultiObject(MultiObject):
     """ Implements a user friendly traits that accepts one or more
     paths to files or directories. This is the output version which
     return a single string whenever possible (when it was set to a
@@ -358,9 +358,9 @@ class OutputMultiPath(MultiPath):
 
     XXX This needs to be vetted by somebody who understands traits
 
-    >>> from nipype.interfaces.base import OutputMultiPath, TraitedSpec
+    >>> from nipype.interfaces.base import OutputMultiObject, TraitedSpec
     >>> class A(TraitedSpec):
-    ...     foo = OutputMultiPath(File(exists=False))
+    ...     foo = OutputMultiObject(File(exists=False))
     >>> a = A()
     >>> a.foo
     <undefined>
@@ -392,7 +392,7 @@ def set(self, object, name, value):
         self.set_value(object, name, value)
 
 
-class InputMultiPath(MultiPath):
+class InputMultiObject(MultiObject):
     """ Implements a user friendly traits that accepts one or more
     paths to files or directories. This is the input version which
     always returns a list. Default value of this trait
@@ -403,9 +403,9 @@ class InputMultiPath(MultiPath):
 
     XXX This needs to be vetted by somebody who understands traits
 
-    >>> from nipype.interfaces.base import InputMultiPath, TraitedSpec
+    >>> from nipype.interfaces.base import InputMultiObject, TraitedSpec
     >>> class A(TraitedSpec):
-    ...     foo = InputMultiPath(File(exists=False))
+    ...     foo = InputMultiObject(File(exists=False))
     >>> a = A()
     >>> a.foo
     <undefined>
@@ -424,3 +424,6 @@ class InputMultiPath(MultiPath):
 
     """
     pass
+
+InputMultiPath = InputMultiObject
+OutputMultiPath = OutputMultiObject