Better names for locals of on_rm_rf_error

Author: nicoddemus

src/_pytest/pathlib.py

@@ -39,19 +39,19 @@ def ensure_reset_dir(path):
     path.mkdir()
 
 
-def on_rm_rf_error(func, epath: str, exc, *, startpath):
+def on_rm_rf_error(func, path: str, exc, *, start_path):
     """Handles known read-only errors during rmtree."""
     excvalue = exc[1]
 
     if not isinstance(excvalue, PermissionError):
         warnings.warn(
-            PytestWarning("(rm_rf) error removing {}: {}".format(epath, excvalue))
+            PytestWarning("(rm_rf) error removing {}: {}".format(path, excvalue))
         )
         return
 
     if func not in (os.rmdir, os.remove, os.unlink):
         warnings.warn(
-            PytestWarning("(rm_rf) error removing {}: {}".format(epath, excvalue))
+            PytestWarning("(rm_rf) error removing {}: {}".format(path, excvalue))
         )
         return
 
@@ -64,23 +64,23 @@ def chmod_rw(p: str):
 
     # For files, we need to recursively go upwards in the directories to
     # ensure they all are also writable.
-    p = Path(epath)
+    p = Path(path)
     if p.is_file():
         for parent in p.parents:
             chmod_rw(str(parent))
             # stop when we reach the original path passed to rm_rf
-            if parent == startpath:
+            if parent == start_path:
                 break
-    chmod_rw(str(epath))
+    chmod_rw(str(path))
 
-    func(epath)
+    func(path)
 
 
 def rm_rf(path: Path):
     """Remove the path contents recursively, even if some elements
     are read-only.
     """
-    onerror = partial(on_rm_rf_error, startpath=path)
+    onerror = partial(on_rm_rf_error, start_path=path)
     shutil.rmtree(str(path), onerror=onerror)
 
 

testing/test_tmpdir.py

@@ -387,17 +387,17 @@ def test_on_rm_rf_error(self, tmp_path):
         # unknown exception
         with pytest.warns(pytest.PytestWarning):
             exc_info = (None, RuntimeError(), None)
-            on_rm_rf_error(os.unlink, fn, exc_info, startpath=tmp_path)
+            on_rm_rf_error(os.unlink, fn, exc_info, start_path=tmp_path)
             assert fn.is_file()
 
         # unknown function
         with pytest.warns(pytest.PytestWarning):
             exc_info = (None, PermissionError(), None)
-            on_rm_rf_error(None, fn, exc_info, startpath=tmp_path)
+            on_rm_rf_error(None, fn, exc_info, start_path=tmp_path)
             assert fn.is_file()
 
         exc_info = (None, PermissionError(), None)
-        on_rm_rf_error(os.unlink, fn, exc_info, startpath=tmp_path)
+        on_rm_rf_error(os.unlink, fn, exc_info, start_path=tmp_path)
         assert not fn.is_file()