Use pathlib in utils/tempdir.

IPython/utils/tempdir.py

@@ -1,57 +1,58 b''
 """ This module contains classes - NamedFileInTemporaryDirectory, TemporaryWorkingDirectory.
 
 These classes add extra features such as creating a named file in temporary directory and
 creating a context manager for the working directory which is also temporary.
 """
 
 import os as _os
+from pathlib import Path
 from tempfile import TemporaryDirectory
 
 
 class NamedFileInTemporaryDirectory(object):
 
     def __init__(self, filename, mode='w+b', bufsize=-1, **kwds):
         """
         Open a file named `filename` in a temporary directory.
 
         This context manager is preferred over `NamedTemporaryFile` in
         stdlib `tempfile` when one needs to reopen the file.
 
         Arguments `mode` and `bufsize` are passed to `open`.
         Rest of the arguments are passed to `TemporaryDirectory`.
 
         """
         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):
         self.file.close()
         self._tmpdir.cleanup()
 
     __del__ = cleanup
 
     def __enter__(self):
         return self.file
 
     def __exit__(self, type, value, traceback):
         self.cleanup()
 
 
 class TemporaryWorkingDirectory(TemporaryDirectory):
     """
     Creates a temporary directory and sets the cwd to that directory.
     Automatically reverts to previous cwd upon cleanup.
     Usage example:
 
         with TemporaryWorkingDirectory() as tmpdir:
             ...
     """
     def __enter__(self):
-        self.old_wd = _os.getcwd()
+        self.old_wd = Path.cwd()
         _os.chdir(self.name)
         return super(TemporaryWorkingDirectory, self).__enter__()
 
     def __exit__(self, exc, value, tb):
         _os.chdir(self.old_wd)
         return super(TemporaryWorkingDirectory, self).__exit__(exc, value, tb)

IPython/utils/tests/test_tempdir.py

@@ -1,28 +1,29 b''
 #-----------------------------------------------------------------------------
 #  Copyright (C) 2012-  The IPython Development Team
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  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
 
 
 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()