Merge pull request ipython#12680 from deep-jkl/pathlib-for-utils-tempdir

Use pathlib in utils/tempdir

Author: Carreau

IPython/utils/tempdir.py

@@ -5,6 +5,7 @@
 """
 
 import os as _os
+from pathlib import Path
 from tempfile import TemporaryDirectory
 
 
@@ -22,7 +23,7 @@ def __init__(self, filename, mode='w+b', bufsize=-1, **kwds):
 
         """
         self._tmpdir = TemporaryDirectory(**kwds)
-        path = _os.path.join(self._tmpdir.name, filename)
+        path = Path(self._tmpdir.name) / filename
         self.file = open(path, mode, bufsize)
 
     def cleanup(self):
@@ -48,7 +49,7 @@ class TemporaryWorkingDirectory(TemporaryDirectory):
             ...
     """
     def __enter__(self):
-        self.old_wd = _os.getcwd()
+        self.old_wd = Path.cwd()
         _os.chdir(self.name)
         return super(TemporaryWorkingDirectory, self).__enter__()
 

IPython/utils/tests/test_tempdir.py

@@ -5,7 +5,7 @@
 #  the file COPYING, distributed as part of this software.
 #-----------------------------------------------------------------------------
 
-import os
+from pathlib import Path
 
 from IPython.utils.tempdir import NamedFileInTemporaryDirectory
 from IPython.utils.tempdir import TemporaryWorkingDirectory
@@ -15,14 +15,15 @@ def test_named_file_in_temporary_directory():
     with NamedFileInTemporaryDirectory('filename') as file:
         name = file.name
         assert not file.closed
-        assert os.path.exists(name)
+        assert Path(name).exists()
         file.write(b'test')
     assert file.closed
-    assert not os.path.exists(name)
+    assert not Path(name).exists()
 
 def test_temporary_working_directory():
-    with TemporaryWorkingDirectory() as dir:
-        assert os.path.exists(dir)
-        assert os.path.realpath(os.curdir) == os.path.realpath(dir)
-    assert not os.path.exists(dir)
-    assert os.path.abspath(os.curdir) != dir
+    with TemporaryWorkingDirectory() as directory:
+        directory_path = Path(directory)
+        assert directory_path.exists()
+        assert Path.cwd() == directory_path.resolve()
+    assert not directory_path.exists()
+    assert Path.cwd() != directory_path.resolve()