GH-73991: Use same signature for shutil._rmtree_[un]safe()
.
#120517
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Preparatory work for moving
_rmtree_unsafe()
and_rmtree_safe_fd()
topathlib._os
so that they can be used from bothshutil
andpathlib
.Move implementation-specific setup from
rmtree()
into the safe/unsafe functions, and give them the same signature(path, dir_fd, onexc)
.In the tests, mock
os.open
rather than_rmtree_safe_fd()
to ensure the FD-based walk is used, and replace a couple references toshutil._use_fd_functions
withshutil.rmtree.avoids_symlink_attacks
(which has the same value).No change of behaviour.