Skip to content

GH-73991: Add pathlib.Path.move() #122073

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

GH-73991: Add pathlib.Path.move() #122073

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f6d09c0
GH-73991: Add `pathlib.Path.move()`
barneygale Jul 21, 2024
1dc0bfb
Simplify slightly
barneygale Jul 21, 2024
f488ff8
Test existing files/directories as destinations.
barneygale Jul 21, 2024
ff7746f
rename --> replace
barneygale Jul 21, 2024
29e51f5
Windows test fixes
barneygale Jul 21, 2024
36955ab
Revert "Windows test fixes"
barneygale Jul 21, 2024
d595047
Handle existing targets more consistently
barneygale Jul 21, 2024
5de963e
Use generic implementation on ERROR_ACCESS_DENIED.
barneygale Jul 21, 2024
e1c0d9e
Expand test coverage, lean into the Windows differences a bit.
barneygale Jul 22, 2024
a98aed4
Loosen tests for OSError types.
barneygale Jul 22, 2024
0af6396
Revert "Loosen tests for OSError types."
barneygale Jul 22, 2024
348cabd
Tweaks
barneygale Jul 22, 2024
aca70d1
Relax expectations once again.
barneygale Jul 22, 2024
aa27f48
skip tests affected by apparent os.replace() inconsistency
barneygale Jul 22, 2024
04b115a
More compatibility experiments.
barneygale Jul 22, 2024
be48d2a
Cunningly avoid specifying the problematic cases.
barneygale Jul 22, 2024
a5ee60a
Fix moving a file/directory to itself.
barneygale Jul 22, 2024
f9219ee
Undo unnecessary change
barneygale Jul 22, 2024
5ad2c1d
Ensure we exit from copytree() when copying directory over itself.
barneygale Jul 27, 2024
46b1fc2
Merge branch 'main' into path-move
barneygale Aug 7, 2024
d889dff
Merge branch 'main' into path-move
barneygale Aug 11, 2024
9d92108
Docs tweak
barneygale Aug 11, 2024
92cc785
Set `filename` and `filename2` in error messages.
barneygale Aug 11, 2024
b8372aa
Simplify patch
barneygale Aug 11, 2024
8199fd5
Undo changes from GH-122924.
barneygale Aug 13, 2024
175d687
Merge branch 'main' into path-move
barneygale Aug 23, 2024
8182a88
Merge branch 'main' into path-move
barneygale Aug 24, 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
Loosen tests for OSError types.
  • Loading branch information
@barneygale
barneygale committed Jul 22, 2024
commit a98aed438cda80a8fb66c4e773bcd4bb1584adf5
11 changes: 4 additions & 7 deletions Lib/pathlib/_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,18 +881,15 @@ def move(self, target):
if not isinstance(target, PathBase):
target = self.with_segments(target)
if self.is_dir(follow_symlinks=False):
delete_target = target.rmdir
try:
target.rmdir()
except FileNotFoundError:
pass
copy_self = self.copytree
delete_self = self.rmtree
else:
delete_target = target.unlink
copy_self = self.copy
delete_self = self.unlink
try:
# Ensure we get an appropriate OSError if the target exists.
delete_target()
except FileNotFoundError:
pass
copy_self(target, follow_symlinks=False, preserve_metadata=True)
delete_self()
return target
Expand Down
25 changes: 4 additions & 21 deletions Lib/test/test_pathlib/test_pathlib_abc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2008,22 +2008,14 @@ def test_move_file_to_dir(self):
base = self.cls(self.base)
source = base / 'fileA'
target = base / 'dirB'
Comment thread
picnixz marked this conversation as resolved.
if self.cls.parser is posixpath:
exc_type = IsADirectoryError
else:
exc_type = PermissionError
self.assertRaises(exc_type, source.move, target)
self.assertRaises(OSError, source.move, target)
Comment thread
picnixz marked this conversation as resolved.

def test_move_file_to_empty_dir(self):
base = self.cls(self.base)
source = base / 'fileA'
target = base / 'fileA_moved'
target.mkdir()
if self.cls.parser is posixpath:
exc_type = IsADirectoryError
else:
exc_type = PermissionError
self.assertRaises(exc_type, source.move, target)
self.assertRaises(OSError, source.move, target)

def test_move_dir(self):
base = self.cls(self.base)
Expand All @@ -2045,22 +2037,13 @@ def test_move_dir_to_file(self):
base = self.cls(self.base)
source = base / 'dirB'
target = base / 'fileA'
if self.cls.parser is posixpath:
exc_type = NotADirectoryError
else:
exc_type = PermissionError
self.assertRaises(exc_type, source.move, target)
self.assertRaises(OSError, source.move, target)

def test_move_dir_to_dir(self):
base = self.cls(self.base)
source = base / 'dirC'
target = base / 'dirB'
with self.assertRaises(OSError) as cm:
source.move(target)
if self.cls.parser is posixpath:
self.assertEqual(cm.exception.errno, errno.ENOTEMPTY)
else:
self.assertEqual(cm.exception.winerror, 5) # ERROR_ACCESS_DENIED
self.assertRaises(OSError, source.move, target)

def test_move_dir_to_empty_dir(self):
base = self.cls(self.base)
Expand Down