Skip to content

gh-118033: Fix __weakref__ not set for generic dataclasses - #118099

Merged
sobolevn merged 6 commits into
python:mainfrom
sobolevn:issue-118033
May 9, 2024
Merged

gh-118033: Fix __weakref__ not set for generic dataclasses#118099
sobolevn merged 6 commits into
python:mainfrom
sobolevn:issue-118033

Conversation

@sobolevn

@sobolevnsobolevn commented Apr 19, 2024•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

Looks like that classes with __weakrefoffset__ == 0 does not need to add __weakref__ slot to existing super ones.

@bedevere-appbedevere-appBot mentioned this pull request Apr 19, 2024
Closed
@sobolevn

sobolevn commented Apr 19, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

No, this is not correct, we also need to check __dictoffset__ as well. For __dict__ case.

@sobolevn

sobolevn commented Apr 19, 2024

Copy link
Copy Markdown
MemberAuthor

Ubuntu failures are not related, there are some network problems right now

carljm
carljm approved these changes Apr 22, 2024
View reviewed changes

@carljmcarljm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this fix is correct; some suggestions and a question.

Comment threadLib/dataclasses.py Outdated
Comment threadLib/dataclasses.py Outdated
Comment threadLib/dataclasses.py Outdated
Comment threadLib/dataclasses.py
@sobolevn
sobolevn requested a review from carljmMay 4, 2024 09:05
carljm
carljm approved these changes May 7, 2024
View reviewed changes

@carljmcarljm left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks fine to me. Sorry I didn't see the notification sooner that you requested another review!

I still think the best version of this might look at __weakrefoffset__ and __dictrefoffset__ always to decide on those two slots, but I agree that's an edge case and can be handled separately; this is still a clear improvement and fixes the original bug.

@sobolevnsobolevn added needs backport to 3.12 only security fixes needs backport to 3.13 bugs and security fixes labels May 9, 2024
@sobolevn
sobolevn enabled auto-merge (squash) May 9, 2024 08:09
@sobolevn
sobolevn disabled auto-merge May 9, 2024 08:35
@sobolevn
sobolevn enabled auto-merge (squash) May 9, 2024 08:35
@sobolevn
sobolevn merged commit fa9b9cb into python:mainMay 9, 2024
@miss-islington-app

miss-islington-appBot commented May 9, 2024

Copy link
Copy Markdown

Thanks @sobolevn for the PR 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2024
@sobolevn@miss-islington
pythongh-118033: Fix__weakref__not set for generic dataclasses (p…
9725fb0
…ythonGH-118099)
(cherry picked from commit fa9b9cb)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 9, 2024
@sobolevn@miss-islington
pythongh-118033: Fix__weakref__not set for generic dataclasses (p…
cf4a239
…ythonGH-118099)
(cherry picked from commit fa9b9cb)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@bedevere-app

bedevere-appBot commented May 9, 2024

Copy link
Copy Markdown

GH-118821 is a backport of this pull request to the 3.13 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label May 9, 2024
@bedevere-app

bedevere-appBot commented May 9, 2024

Copy link
Copy Markdown

GH-118822 is a backport of this pull request to the 3.12 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.12 only security fixes label May 9, 2024
sobolevn added a commit that referenced this pull request May 9, 2024
@miss-islington@sobolevn
[3.13]gh-118033: Fix__weakref__not set for generic dataclasses (G…
632682c
…H-118099) (#118821)
gh-118033: Fix `__weakref__` not set for generic dataclasses (GH-118099)
(cherry picked from commit fa9b9cb)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
sobolevn added a commit that referenced this pull request May 9, 2024
@miss-islington@sobolevn
[3.12]gh-118033: Fix__weakref__not set for generic dataclasses (G…
e953956
…H-118099) (#118822)
gh-118033: Fix `__weakref__` not set for generic dataclasses (GH-118099)
(cherry picked from commit fa9b9cb)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
@sobolevnsobolevn mentioned this pull request May 9, 2024
Open
@JelleZijlstraJelleZijlstra mentioned this pull request May 28, 2024
Closed
@sobolevnsobolevn mentioned this pull request Sep 11, 2024
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@carljmcarljmcarljm approved these changes
@ericvsmithericvsmithAwaiting requested review from ericvsmithericvsmith is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sobolevn@carljm