FIX: Handle missing paths better pre-3.6

Author: effigies

nipype/utils/filemanip.py

@@ -60,14 +60,30 @@ def __init__(self, path):
     USING_PATHLIB2 = True
 
 
+def _resolve_with_filenotfound(path, **kwargs):
+    """ Raise FileNotFoundError instead of OSError """
+    try:
+        return path.resolve(**kwargs)
+    except OSError as e:
+        if isinstance(e, FileNotFoundError):
+            raise
+        raise FileNotFoundError(str(path))
+
+
 def path_resolve(path, strict=False):
     try:
-        return path.resolve(strict=strict)
+        return _resolve_with_filenotfound(path, strict=strict)
     except TypeError:  # PY35
-        resolved = path.resolve()
-        if strict and not resolved.exists():
-            raise FileNotFoundError(resolved)
-        return resolved
+        pass
+
+    path = path.absolute()
+    if strict or path.exists():
+        return _resolve_with_filenotfound(path)
+
+    # This is a hacky shortcut, using path.absolute() unmodified
+    # In cases where the existing part of the path contains a
+    # symlink, different results will be produced
+    return path
 
 
 def path_mkdir(path, mode=0o777, parents=False, exist_ok=False):

nipype/utils/tests/test_filemanip.py

@@ -580,8 +580,6 @@ def test_path_strict_resolve(tmpdir):
     # Default strict=False should work out out of the box
     testfile = Path('somefile.txt')
     resolved = '%s/somefile.txt' % tmpdir
-    assert str(testfile.resolve()) == resolved
-    # path_resolve() is equivalent to Path.resolve()
     assert str(path_resolve(testfile)) == resolved
     # Strict keyword is always allowed
     assert str(path_resolve(testfile, strict=False)) == resolved