diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-11-10 16:29:35 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 16:29:35 (GMT) |
| commit | 14a343a9af27725faeab8b330a6d66ff573704d3 (patch) | |
| tree | 77f50bf6f3fba4504444ce26882fcba0909502a0 | |
| parent | 90115a2cf7033c990a54d1ecb90ebd850b5f13cf (diff) | |
| download | cpython-14a343a9af27725faeab8b330a6d66ff573704d3.zip cpython-14a343a9af27725faeab8b330a6d66ff573704d3.tar.gz cpython-14a343a9af27725faeab8b330a6d66ff573704d3.tar.bz2 | |
bpo-42014: shutil.rmtree: call onerror with correct function (GH-22585)
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
(cherry picked from commit e59b2deffde61e5641cabd65034fa11b4db898ba)
Co-authored-by: Michal Čihař <michal@cihar.com>
| -rw-r--r-- | Lib/shutil.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-11-10-15-40-56.bpo-42014.ShM37l.rst | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Lib/shutil.py b/Lib/shutil.py index 223e9a8..f0e833d 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -711,7 +711,7 @@ def rmtree(path, ignore_errors=False, onerror=None): 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 new file mode 100644 index 0000000..d3e1abc --- /dev/null +++ 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.
\ No newline at end of file |