Repository navigation
[3.15] gh-149504: Fix re-entrancy bug when .pth/.start file invokes site.add sitedir() (#149659) - #149799
Merged
warsaw merged 2 commits intoMay 13, 2026
Merged
[3.15] gh-149504: Fix re-entrancy bug when .pth/.start file invokes site.add sitedir() (#149659)#149799warsaw merged 2 commits into
warsaw merged 2 commits into
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
…te.addsitedir() (python#149659) * Add re-entrant tests for pythongh-149504 * Add end-to-end integration test coverage This ensures that future whitebox internal test changes do not regress the public surface semantics. * Implement a state class to process .pth and .start files By using this state class and managing implicit and explicit batching, we make it structurally impossible to get bitten by re-entrant site startup processing. Fixes python#149504 (cherry picked from commit b162307)
warsaw
requested review from
AA-Turner,
ezio-melotti,
hugovk and
webknjaz
as code owners
May 13, 2026 19:19
jjhelmus
added a commit
to astral-sh/python-build-standalone
that referenced
this pull request
Jun 2, 2026
3.15.0b1 -> 3.15.0b2. Remove patch introduced in #1123 as a different fix was merged upstream in python/cpython#149799 This makes #1130 unnecessary
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
Reviewers
Assignees
1 participant
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.
This ensures that future whitebox internal test changes do not regress the public surface semantics.
By using this state class and managing implicit and explicit batching, we make it structurally impossible to get bitten by re-entrant site startup processing.
Fixes #149504
(cherry picked from commit b162307)