Repository navigation
gh-161112: Fix shutil.make_archive() adding a zip archive to itself - #161113
Merged
Merged
Conversation
…self Skip any walked file that is the archive being written, whether it is created inside the archived tree or a symlink in the tree points at it.
gpshead
added
needs backport to 3.14
gpshead
marked this pull request as ready for review
November 1, 2026 18:45
gpshead
enabled auto-merge (squash)
November 1, 2026 18:45
|
Thanks @gpshead for the PR 🌮🎉.. I'm working now to backport this PR to: 3.14, 3.15. |
|
GH-161139 is a backport of this pull request to the 3.14 branch. |
|
GH-161140 is a backport of this pull request to the 3.15 branch. |
gpshead
added a commit
that referenced
this pull request
Nov 1, 2026
gpshead
added a commit
that referenced
this pull request
Nov 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
_make_zipfile()now stats the archive once after creating it and skips any walked file that isos.path.samestat()with it, which also catches a symlink or hard link to the archive. Theos.path.isfile()call that already stats every file is replaced byos.stat()plusS_ISREG, so no syscalls are added per file. The check stays inshutilinstead ofZipFile.write(), where it was declined in gh-104527 because of its per-file cost.Fixes #161112
shutil.make_archive()adds the zip archive to itself when it is inside the archived tree #161112