Thanks to visit codestin.com
Credit goes to github.com

Skip to content

GH-73991: Add pathlib.Path.rmtree() #119060

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
merged 23 commits into from
Jul 20, 2024
+448 −5
Merged

GH-73991: Add pathlib.Path.rmtree() #119060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bbcb1ce
GH-73991: Add `pathlib.Path.rmtree()`
barneygale May 15, 2024
94ef5c1
Merge branch 'main' into gh-73991-rmtree
barneygale May 15, 2024
62f7eae
Use `os.walk()` and `os.fwalk()` rather than `shutil.rmtree()`
barneygale May 27, 2024
4c73a92
Undo shutil change
barneygale May 27, 2024
98fa2e2
Line up implementations
barneygale May 27, 2024
7819005
Merge branch 'main' into gh-73991-rmtree
barneygale May 27, 2024
b504019
Tests
barneygale May 27, 2024
bdd1255
Merge branch 'main' into gh-73991-rmtree
barneygale Jun 2, 2024
5d2472e
Merge branch 'main' into gh-73991-rmtree
barneygale Jun 18, 2024
eadbbe6
Merge branch 'main' into gh-73991-rmtree
barneygale Jun 18, 2024
ab7b086
Use implementation from shutil
barneygale Jun 18, 2024
f88fc12
Fix some Windows tests.
barneygale Jun 18, 2024
5a0fc07
More Windows test tweaks
barneygale Jun 18, 2024
2559e6a
This is confusing :/
barneygale Jun 19, 2024
5588e1f
Merge branch 'main' into gh-73991-rmtree
barneygale Jun 24, 2024
bcff053
WIP
barneygale Jun 24, 2024
be00bfe
Merge branch 'main' into gh-73991-rmtree
barneygale Jun 24, 2024
d8c4291
Fix docs
barneygale Jun 27, 2024
a9c8d4f
Minor tweaks
barneygale Jun 27, 2024
4bcc143
Apply suggestions from code review
barneygale Jul 4, 2024
ab0f447
Address review feedback.
barneygale Jul 4, 2024
40ed5c8
Merge branch 'main' into gh-73991-rmtree
barneygale Jul 20, 2024
0cf0180
Merge branch 'main' into gh-73991-rmtree
AA-Turner Jul 20, 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
Fix some Windows tests.
  • Loading branch information
@barneygale
barneygale committed Jun 18, 2024
commit f88fc12dbb0b84a465564cb4fe7a39073b0fbb76
1 change: 1 addition & 0 deletions Lib/pathlib/_local.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ def onexc(func, filename, err):
pass
elif on_error:
def onexc(func, filename, err):
err.filename = filename
on_error(err)
else:
def onexc(func, filename, err):
Expand Down
11 changes: 6 additions & 5 deletions Lib/test/test_pathlib/test_pathlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,11 +834,11 @@ def test_rmtree_inner_junction(self):
file1 = tmp / 'file1'
file1.write_text('foo')
link1 = dir1 / 'link1'
_winapi.CreateJunction(dir2, link1)
_winapi.CreateJunction(str(dir2), str(link1))
link2 = dir1 / 'link2'
_winapi.CreateJunction(dir3, link2)
_winapi.CreateJunction(str(dir3), str(link2))
link3 = dir1 / 'link3'
_winapi.CreateJunction(file1, link3)
_winapi.CreateJunction(str(file1), str(link3))
# make sure junctions are removed but not followed
dir1.rmtree()
self.assertFalse(dir1.exists())
Expand All @@ -849,13 +849,14 @@ def test_rmtree_inner_junction(self):
def test_rmtree_outer_junction(self):
import _winapi
tmp = self.cls(self.base, 'rmtree')
tmp.mkdir()
try:
src = tmp / 'cheese'
dst = tmp / 'shop'
src.mkdir()
spam = src / 'spam'
spam.write_text('')
_winapi.CreateJunction(src, dst)
_winapi.CreateJunction(str(src), str(dst))
self.assertRaises(OSError, dst.rmtree)
dst.rmtree(ignore_errors=True)
finally:
Expand All @@ -869,7 +870,7 @@ def test_rmtree_outer_junction_on_error(self):
dir_ = tmp / 'dir'
dir_.mkdir()
link = tmp / 'link'
_winapi.CreateJunction(dir_, link)
_winapi.CreateJunction(str(dir_), str(link))
self.addCleanup(os_helper.unlink, link)
self.assertRaises(OSError, link.rmtree)
self.assertTrue(dir_.exists())
Expand Down