fix tp_clear of subclass not being installed properly - #6315
Open
davidhewitt wants to merge 1 commit into
Open
Conversation
Member
Author
|
Doesn't need a changelog entry because it's a correction to the unreleased #6269. |
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
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 is a followup to #6269
When creating a subclass with a
__clear__implementation, the condition forbase_is_gc()introduced in #6269 would incorrectly cause thesynthesized_clearto replace the user-provided__clear__.This PR fixes the condition to instead nest the if statements so that the
!self.has_cleargates the whole block. I also tweaked the logic when delegating to the base clear so that instead of installingsynthesized_clearwhich walks the MRO to discover the base clear, we just copy the base clear slot directly.Credit to Codex security scanning for the discovery.