Skip to content

GH-89727: Partially fix shutil.rmtree() recursion error on deep trees #119634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barneygale merged 7 commits into from
May 29, 2024
+33 −28
Merged

GH-89727: Partially fix shutil.rmtree() recursion error on deep trees #119634

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
55adfeb
GH-89727: Partially fix `shutil.rmtree()` recursion error on deep trees
barneygale May 27, 2024
e5c8ceb
Simplify diff
barneygale May 27, 2024
96293a5
Update Lib/shutil.py
barneygale May 29, 2024
3b1b15e
Undo premature optimisation
barneygale May 29, 2024
4fe3075
Add NEWS
barneygale May 29, 2024
857bcfa
Merge branch 'main' into gh-89727-use-os-walk
barneygale May 29, 2024
27ee6f0
Update Misc/NEWS.d/next/Library/2024-05-29-20-42-17.gh-issue-89727.5l…
barneygale May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Undo premature optimisation
  • Loading branch information
@barneygale
barneygale committed May 29, 2024
commit 3b1b15e3024b2f7460bdeb3b9737cd536fcf3b3a
6 changes: 2 additions & 4 deletions Lib/shutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,18 +611,16 @@ def onerror(err):
onexc(os.scandir, err.filename, err)
results = os.walk(path, topdown=False, onerror=onerror, followlinks=os._walk_symlinks_as_files)
for dirpath, dirnames, filenames in results:
# Add trailing slash to dirpath.
dirpath = os.path.join(dirpath, dirpath[:0])
for name in dirnames:
fullname = dirpath + name
fullname = os.path.join(dirpath, name)
try:
os.rmdir(fullname)
except FileNotFoundError:
continue
except OSError as err:
onexc(os.rmdir, fullname, err)
for name in filenames:
fullname = dirpath + name
fullname = os.path.join(dirpath, name)
try:
os.unlink(fullname)
except FileNotFoundError:
Expand Down