gh-149504: Fix re-entrancy bug when .pth/.start file invokes site.addsitedir()#149659
Open
warsaw wants to merge 7 commits into
Open
gh-149504: Fix re-entrancy bug when .pth/.start file invokes site.addsitedir()#149659warsaw wants to merge 7 commits into
warsaw wants to merge 7 commits into
Conversation
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 python#149504 Update all the implementation and integration tests.
Member
|
I'll try to take a look if you want more reviews but I don't really know site.py. Thanks for working on this! |
Member
Author
That's okay. I just tagged you to check that the |
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.
Fix
site.addsitedir()to allow re-entrant calls from within startup files. Previously, a.pthfile containing animportline that calledsite.addsitedir()(or a.startentry point doing the same) could crash withRuntimeError: dictionary changed size during iterationduring site initialization, breaking tools such asuv run --with.prints "done" for me.
does not crash.
The implementation is more comprehensive than #149516 and is more inline with a suggestion @ncoghlan made on the original PR. Thanks @zsol for providing your PR. @JelleZijlstra please take a look.
site.addsitedir()can fail (affecting uv run) #149504