fix: final cleanup after rebase

Author: oesteban

nipype/interfaces/base/__init__.py

@@ -22,7 +22,7 @@
 from .traits_extension import (
     traits, Undefined, isdefined, has_metadata,
     File, ImageFile, Directory,
-    Tuple, Either, Str, DictStrStr,
+    Str, DictStrStr,
     OutputMultiObject, InputMultiObject,
     OutputMultiPath, InputMultiPath)
 

nipype/interfaces/base/tests/test_traits_extension.py

@@ -9,17 +9,17 @@
 
 class _test_spec(nib.TraitedSpec):
     a = nib.File()
-    b = nib.Tuple(nib.File(), nib.File())
+    b = nib.traits.Tuple(nib.File(), nib.File())
     c = nib.traits.List(nib.File())
-    d = nib.Either(nib.File(), nib.traits.Float())
+    d = nib.traits.Either(nib.File(), nib.traits.Float())
     e = nib.OutputMultiObject(nib.File())
     ee = nib.OutputMultiObject(nib.Str)
     f = nib.traits.Dict(nib.Str, nib.File())
-    g = nib.Either(nib.File, nib.Str)
+    g = nib.traits.Either(nib.File, nib.Str)
     h = nib.Str
-    i = nib.Either(nib.File, nib.Tuple(nib.File, nib.traits.Int))
-    j = nib.Either(nib.File, nib.Tuple(nib.File, nib.traits.Int),
-                   nib.traits.Dict(nib.Str, nib.File()))
+    i = nib.traits.Either(nib.File, nib.traits.Tuple(nib.File, nib.traits.Int))
+    j = nib.traits.Either(nib.File, nib.traits.Tuple(nib.File, nib.traits.Int),
+                          nib.traits.Dict(nib.Str, nib.File()))
 
 
 def test_rebase_path_traits():

nipype/interfaces/base/traits_extension.py

@@ -30,7 +30,6 @@
 import traits.api as traits
 from traits.trait_handlers import TraitType, NoDefaultSpecified
 from traits.trait_base import _Undefined
-from traits.traits import _TraitMaker, trait_from
 
 from traits.api import Unicode
 from future import standard_library
@@ -39,11 +38,6 @@
 if USING_PATHLIB2:
     from future.types.newstr import newstr
 
-try:
-    from pathlib import Path
-except ImportError:
-    from pathlib2 import Path
-
 
 if traits_version < '3.7.0':
     raise ImportError('Traits version 3.7.0 or higher must be installed')
@@ -471,18 +465,6 @@ class InputMultiObject(MultiObject):
 OutputMultiPath = OutputMultiObject
 
 
-class Tuple(traits.Tuple):
-    pass
-
-
-class Either(traits.Either):
-    pass
-
-
-traits.Tuple = Tuple
-traits.Either = Either
-
-
 def _rebase_path(value, cwd):
     if isinstance(value, list):
         return [_rebase_path(v, cwd) for v in value]
@@ -528,7 +510,7 @@ def _recurse_on_path_traits(func, thistrait, value, cwd):
         _, innertrait = thistrait.inner_traits
         value = {k: _recurse_on_path_traits(func, innertrait, v, cwd)
                  for k, v in value.items()}
-    elif isinstance(value, tuple) and thistrait.is_trait_type(Tuple):
+    elif isinstance(value, tuple) and thistrait.is_trait_type(traits.Tuple):
         value = tuple([_recurse_on_path_traits(func, subtrait, v, cwd)
                        for subtrait, v in zip(thistrait.handler.types, value)])
     elif thistrait.is_trait_type(traits.TraitCompound):