[3.13] gh-105936: Properly update closure cells for __setattr__ and __delattr__ in frozen dataclasses with slots (GH-144021)#148476
Draft
gpshead wants to merge 1 commit intopython:3.13from
Draft
Conversation
…_` and `__delattr__` in frozen dataclasses with slots (pythonGH-144021) pythongh-105936: Properly update closure cells for `__setattr__` and `__delattr__` in frozen dataclasses with slots (pythonGH-144021) (cherry picked from commit 8a398bf) The cherry-pick required additional changes beyond the original commit because 3.13 lacks the `__class__` closure cell fixup machinery that was added in 3.14 by pythonGH-124455 (pythongh-90562). Specifically: - Backported `_update_func_cell_for__class__()` helper function and the closure fixup loop in `_add_slots()` from pythonGH-124455. Without these, renaming the closure variable from `cls` to `__class__` has no effect because nothing updates the cell when the class is recreated with slots. - Changed `_add_slots()` to use `newcls` instead of reusing `cls` for the recreated class, so both old and new class references are available for the fixup loop. - Replaced `assertNotHasAttr` with `assertFalse(hasattr(...))` in tests (assertNotHasAttr was added in 3.14). - Dropped `test_original_class_is_gced` additions (that test does not exist on 3.13; it was added by pythonGH-137047 for pythongh-135228 which was not backported to 3.13). Co-authored-by: Prometheus3375 <prometheus3375@gmail.com> Co-authored-by: Sviataslau <35541026+Prometheus3375@users.noreply.github.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Member
Author
|
The is left as a Draft because it required more changes and backporting pieces of some other stuff that is already in 3.14 in order for it to be possible on 3.13. Closer review required. |
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.
gh-105936: Properly update closure cells for
__setattr__and__delattr__in frozen dataclasses with slots (GH-144021) (cherry picked from commit 8a398bf)The cherry-pick required additional changes beyond the original commit because 3.13 lacks the
__class__closure cell fixup machinery that was added in 3.14 by GH-124455 (gh-90562). Specifically:Co-authored-by: Sviataslau 35541026+Prometheus3375@users.noreply.github.com
_update_func_cell_for__class__()helper function and the closure fixup loop in_add_slots()from gh-90562: Support zero argument super with dataclasses when slots=True #124455. Without these, renaming the closure variable fromclsto__class__has no effect because nothing updates the cell when the class is recreated with slots._add_slots()to usenewclsinstead of reusingclsfor the recreated class, so both old and new class references are available for the fixup loop.assertNotHasAttrwithassertFalse(hasattr(...))in tests (assertNotHasAttr was added in 3.14).test_original_class_is_gcedadditions (that test does not exist on 3.13; it was added by gh-135228: When @dataclass(slots=True) replaces a dataclass, make the original class collectible (take 2) #137047 for 3.14 regression: slot dataclasses classes leak original class #135228 which was not backported to 3.13).