Skip to content

ENH: Modify Directory and File traits to get along with pathlib #2962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oesteban merged 11 commits into from
Jul 17, 2019
Merged

ENH: Modify Directory and File traits to get along with pathlib #2962

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
052461d
ENH: Modify ``Directory`` and ``File`` traits to get along with pathlib
oesteban Jul 16, 2019
b76860d
sty: better placement of imports from enthought.traits
oesteban Jul 16, 2019
e993a7f
enh(filemanip): Solidify a patched version of ``pathlib.Path`` for in…
oesteban Jul 17, 2019
06ba99f
fix(py2/34): address compatibility issues
oesteban Jul 17, 2019
ab2ebb6
Merge remote-tracking branch 'upstream/master' into enh/improved-File…
oesteban Jul 17, 2019
5e69e7a
Update nipype/interfaces/spm/base.py [skip ci]
oesteban Jul 17, 2019
523a21e
Update nipype/interfaces/base/traits_extension.py [skip ci]
oesteban Jul 17, 2019
c1d1151
fix: make info_text of ``BasePath``s a property (@effigies' suggestion)
oesteban Jul 17, 2019
6c3858a
fix: remove pathlike metadata as it wasn't useful
oesteban Jul 17, 2019
66c0f9b
fix: remove unused ``USING_PATHLIB_PATCHED``
oesteban Jul 17, 2019
d42db56
sty: make codacy happy (Redefining built-in 'FileNotFoundError')
oesteban Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: remove unused USING_PATHLIB_PATCHED
  • Loading branch information
@oesteban
oesteban committed Jul 17, 2019
commit 66c0f9b1ae83f0646ae71b913ef2991938ea21bb
2 changes: 0 additions & 2 deletions nipype/utils/filemanip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ def __init__(self, path):


USING_PATHLIB2 = False
USING_PATHLIB_PATCHED = False
try:
from pathlib import Path
except ImportError:
Expand All @@ -70,7 +69,6 @@ def _patch_resolve(self, strict=False):

Path.old_resolve = Path.resolve
Path.resolve = _patch_resolve
USING_PATHLIB_PATCHED = True
except FileNotFoundError:
pass
except OSError:
Expand Down