Skip to content

GH-73991: Rework pathlib.Path.rmtree() into delete() #122368

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 11 commits into from
Aug 7, 2024
Merged

GH-73991: Rework pathlib.Path.rmtree() into delete() #122368

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
339a85f
GH-73991: Rework `pathlib.Path.rmtree()` into `delete()`
barneygale Jul 27, 2024
632279a
Fix ignore_errors
barneygale Jul 27, 2024
66609fb
Docs, style.
barneygale Jul 28, 2024
b7c72d0
Address docs feedback.
barneygale Jul 29, 2024
f5b788e
Shrink overlarge `try:` block.
barneygale Jul 29, 2024
fcf1cae
Address some review comments.
barneygale Jul 30, 2024
e9835e0
Move method docs after rmdir and unlink
barneygale Jul 30, 2024
b84b0e0
Add `Path.delete.avoids_symlink_attacks`
barneygale Aug 3, 2024
1e5ad10
Missing docs def
barneygale Aug 3, 2024
4ae320f
Merge branch 'main' into rename-rmtree-to-delete
barneygale Aug 3, 2024
549b16c
Merge branch 'main' into rename-rmtree-to-delete
barneygale Aug 6, 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
Shrink overlarge try: block.
  • Loading branch information
@barneygale
barneygale committed Jul 29, 2024
commit f5b788e04db4f593da6fa96a046c79630cba6a1d
39 changes: 20 additions & 19 deletions Lib/pathlib/_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,26 +935,27 @@ def on_error(err):
elif on_error is None:
def on_error(err):
raise err
if self.is_dir(follow_symlinks=False):
results = self.walk(
on_error=on_error,
top_down=False, # So we rmdir() empty directories.
follow_symlinks=False)
for dirpath, dirnames, filenames in results:
for name in filenames:
try:
dirpath.joinpath(name).unlink()
except OSError as err:
on_error(err)
for name in dirnames:
try:
dirpath.joinpath(name).rmdir()
except OSError as err:
on_error(err)
delete_self = self.rmdir
else:
delete_self = self.unlink
try:
if self.is_dir(follow_symlinks=False):
results = self.walk(
on_error=on_error,
top_down=False, # So we rmdir() empty directories.
follow_symlinks=False)
for dirpath, dirnames, filenames in results:
for name in filenames:
try:
dirpath.joinpath(name).unlink()
except OSError as err:
on_error(err)
for name in dirnames:
try:
dirpath.joinpath(name).rmdir()
except OSError as err:
on_error(err)
self.rmdir()
else:
self.unlink()
delete_self()
except OSError as err:
err.filename = str(self)
on_error(err)
Expand Down