Skip to content

GH-73991: Prune pathlib.Path.delete() arguments #123158

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

Closed
wants to merge 5 commits into from
Closed

GH-73991: Prune pathlib.Path.delete() arguments #123158

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a03d81
GH-73991: Prune `pathlib.Path.delete()`
barneygale Aug 19, 2024
2420b85
Windows tests fixes
barneygale Aug 19, 2024
b934731
Improve deletion of junctions
barneygale Aug 19, 2024
8edcabe
Junction handling tweaks
barneygale Aug 19, 2024
229b60a
Undo unnecessary change.
barneygale Aug 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
Windows tests fixes
  • Loading branch information
@barneygale
barneygale committed Aug 19, 2024
commit 2420b85cb6adcd896e4217ea1bf3f3ae7fe2af5c
48 changes: 7 additions & 41 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 @@ -715,11 +715,6 @@ def test_copy_dir_no_read_permission(self):
target = base / 'copyE'
self.assertRaises(PermissionError, source.copy, target)
self.assertFalse(target.exists())
errors = []
source.copy(target, on_error=errors.append)
self.assertEqual(len(errors), 1)
self.assertIsInstance(errors[0], PermissionError)
self.assertFalse(target.exists())

def test_copy_dir_preserve_metadata(self):
base = self.cls(self.base)
Expand Down Expand Up @@ -939,42 +934,13 @@ def test_delete_outer_junction(self):
import _winapi
tmp = self.cls(self.base, 'delete')
tmp.mkdir()
try:
src = tmp / 'cheese'
dst = tmp / 'shop'
src.mkdir()
spam = src / 'spam'
spam.write_text('')
_winapi.CreateJunction(str(src), str(dst))
self.assertRaises(OSError, dst.delete)
dst.delete(ignore_errors=True)
finally:
tmp.delete(ignore_errors=True)

@needs_windows
def test_delete_outer_junction_on_error(self):
import _winapi
tmp = self.cls(self.base, 'delete')
tmp.mkdir()
dir_ = tmp / 'dir'
dir_.mkdir()
link = tmp / 'link'
_winapi.CreateJunction(str(dir_), str(link))
try:
self.assertRaises(OSError, link.delete)
self.assertTrue(dir_.exists())
self.assertTrue(link.exists(follow_symlinks=False))
errors = []

def on_error(error):
errors.append(error)

link.delete(on_error=on_error)
self.assertEqual(len(errors), 1)
self.assertIsInstance(errors[0], OSError)
self.assertEqual(errors[0].filename, str(link))
finally:
os.unlink(str(link))
src = tmp / 'cheese'
dst = tmp / 'shop'
src.mkdir()
spam = src / 'spam'
spam.write_text('')
_winapi.CreateJunction(str(src), str(dst))
self.assertRaises(OSError, dst.delete)

@unittest.skipUnless(delete_use_fd_functions, "requires safe delete")
def test_delete_fails_on_close(self):
Expand Down
Loading