fix(py2/34): address compatibility issues

Author: oesteban

nipype/interfaces/base/traits_extension.py

@@ -33,9 +33,10 @@
 
 from traits.api import Unicode
 from future import standard_library
+from ...utils.filemanip import Path, USING_PATHLIB2
 
-from ...utils.filemanip import Path
-
+if USING_PATHLIB2:
+    from future.types.newstr import newstr
 
 if traits_version < '3.7.0':
     raise ImportError('Traits version 3.7.0 or higher must be installed')
@@ -127,7 +128,9 @@ def __init__(self, value=Undefined,
     def validate(self, objekt, name, value, return_pathlike=False):
         """Validate a value change."""
         try:
-            value = Path('%s' % value)  # Use pathlib's validation
+            if USING_PATHLIB2 and isinstance(value, newstr):
+                value = '%s' % value  # pathlib2 doesn't like newstr
+            value = Path(value)  # Use pathlib's validation
         except Exception:
             self.error(objekt, name, str(value))
 

nipype/utils/filemanip.py

@@ -41,7 +41,7 @@
 
 
 class FileNotFoundError(OSError):
-    """Defines the expception for Python 2."""
+    """Defines the exception for Python 2."""
 
     def __init__(self, path):
         """Initialize the exception."""
@@ -75,7 +75,7 @@ def _patch_resolve(self, strict=False):
     pass
 except OSError:
     def _patch_resolve(self, strict=False):
-        """Add the argument strict to signature for pathlib2."""
+        """Raise FileNotFoundError instead of OSError with pathlib2."""
         try:
             resolved = self.old_resolve(strict=strict)
         except OSError:

nipype/utils/tests/test_filemanip.py

@@ -585,5 +585,5 @@ def test_Path_strict_resolve(tmpdir):
         testfile.resolve(strict=True)
 
     # If the file is created, it should not raise
-    testfile.write_text('')
+    open('somefile.txt', 'w').close()
     assert '%s/somefile.txt' % tmpdir == '%s' % testfile.resolve(strict=True)