bpo-42014: shutil.rmtree: call onerror with correct function (GH-22585)

nijel · web-flow · commit e59b2deffde6 · 2020-11-10T08:06:02.000-08:00
The onerror is supposed to be called with failed function, but in this case lstat is wrongly used instead of open.

Not sure if this needs bug or not...

Automerge-Triggered-By: GH:hynek
diff --git a/Lib/shutil.py b/Lib/shutil.py
@@ -711,7 +711,7 @@ def onerror(*args):
         try:
             fd = os.open(path, os.O_RDONLY)
         except Exception:
-            onerror(os.lstat, path, sys.exc_info())
+            onerror(os.open, path, sys.exc_info())
             return
         try:
             if os.path.samestat(orig_st, os.fstat(fd)):
diff --git a/Misc/NEWS.d/next/Library/2020-11-10-15-40-56.bpo-42014.ShM37l.rst b/Misc/NEWS.d/next/Library/2020-11-10-15-40-56.bpo-42014.ShM37l.rst
@@ -0,0 +1 @@
+The ``onerror`` callback from ``shutil.rmtree`` now receives correct function when ``os.open`` fails.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+The ``onerror`` callback from ``shutil.rmtree`` now receives correct function when ``os.open`` fails.