Replace path/path.py with pathlib & os

Author: jonbannister

pytest-shutil/pytest_shutil/run.py

@@ -190,7 +190,7 @@ def run_in_subprocess(fn, python=sys.executable, cd=None, timeout=None):
         Raises execnet.RemoteError on exception.
     """
     pkl_fn, preargs = (_evaluate_fn_source, (fn,)) if isinstance(fn, str) else _make_pickleable(fn)
-    spec = '//'.join(filter(None, ['popen', 'python=' + python, 'chdir=' + cd if cd else None]))
+    spec = '//'.join(filter(None, ['popen', 'python=' + python, 'chdir=' + str(cd) if cd else None]))
 
     def inner(*args, **kwargs):
         # execnet sends stdout to /dev/null :(

pytest-shutil/pytest_shutil/workspace.py

@@ -7,13 +7,8 @@
 import logging
 import subprocess
 
-try:
-    from path import Path
-except ImportError:
-    from path import path as Path
-
+from pathlib import Path
 import pytest
-from six import string_types
 
 from . import cmdline
 
@@ -23,15 +18,15 @@
 @pytest.yield_fixture()
 def workspace():
     """ Function-scoped temporary workspace that cleans up on exit.
-    
+
     Attributes
     ----------
     workspace (`path.path`):  Path to the workspace directory.
     debug (bool):             If set to True, will log more debug when running commands.
-    delete (bool):            If True, will always delete the workspace on teardown; 
-    ..                        If None, delete the workspace unless teardown occurs via an exception; 
+    delete (bool):            If True, will always delete the workspace on teardown;
+    ..                        If None, delete the workspace unless teardown occurs via an exception;
     ..                        If False, never delete the workspace on teardown.
-        
+
     """
     ws = Workspace()
     yield ws
@@ -99,7 +94,7 @@ def run(self, cmd, capture=False, check_rc=True, cd=None, shell=False, **kwargs)
         cd : `str`
             Path to chdir to, defaults to workspace root
         """
-        if isinstance(cmd, string_types):
+        if isinstance(cmd, str):
             shell = True
         else:
             # Some of the command components might be path objects or numbers
@@ -116,7 +111,7 @@ def run(self, cmd, capture=False, check_rc=True, cd=None, shell=False, **kwargs)
                 p = subprocess.Popen(cmd, shell=shell, **kwargs)
             (out, _) = p.communicate()
 
-            if out is not None and not isinstance(out, string_types):
+            if out is not None and not isinstance(out, str):
                 out = out.decode('utf-8')
 
             if self.debug and capture:

pytest-shutil/setup.py

@@ -19,11 +19,7 @@
 
 install_requires = ['six',
                     'execnet',
-                    'contextlib2;python_version<"3"',
                     'pytest',
-                    'path>=16.12.0; python_version >= "3.5"',
-                    'path.py; python_version < "3.5"',
-                    'mock; python_version<"3.3"',
                     'termcolor'
                     ]
 

pytest-shutil/tests/unit/test_cmdline.py

@@ -1,4 +1,3 @@
-import stat
 import os
 
 from pytest_shutil import cmdline
@@ -16,7 +15,7 @@ def test_pretty_formatter():
     f.hr()
     f.p('A Paragraph', 'red')
     assert f.buffer == [
-        '\x1b[1m\x1b[34m  A Title\x1b[0m', 
+        '\x1b[1m\x1b[34m  A Title\x1b[0m',
         '\x1b[1m\x1b[34m--------------------------------------------------------------------------------\x1b[0m',
         '\x1b[31mA Paragraph\x1b[0m'
         ]
@@ -32,8 +31,8 @@ def test_tempdir():
 def test_copy_files(workspace):
     d1 = workspace.workspace / 'd1'
     d2 = workspace.workspace / 'd2'
-    d1.makedirs()
-    d2.makedirs()
+    os.makedirs(d1)
+    os.makedirs(d2)
     (d1 / 'foo').touch()
     (d1 / 'bar').touch()
     cmdline.copy_files(d1, d2)