Skip to content

gh-135368: Fix mocks on dataclass specs with instance=True - #135421

Merged
cjw296 merged 3 commits into
python:mainfrom
sobolevn:issue-135368-fix
Jun 14, 2025
Merged

gh-135368: Fix mocks on dataclass specs with instance=True#135421
cjw296 merged 3 commits into
python:mainfrom
sobolevn:issue-135368-fix

Conversation

@sobolevn

@sobolevnsobolevn commented Jun 12, 2025•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

cc @ncoghlan, @cdce8p

This brings back two features mentioned in #135368

  • __class__
  • __dataclass_*__ features

Basically, the fix is rather obvious: we just set the proper fields.

__annotations__ has changed due to __annotate__ function, this is not our fault :)

I also have a revert PR ready, if this one is not good enough.

Refs #124429

@sobolevn
sobolevn requested a review from cjw296 as a code ownerJune 12, 2025 07:49
@bedevere-appbedevere-appBot mentioned this pull request Jun 12, 2025
Closed
cdce8p
cdce8p reviewed Jun 12, 2025
View reviewed changes
Comment threadLib/unittest/mock.py Outdated
@cdce8pcdce8p mentioned this pull request Jun 12, 2025
Merged
@python-cla-bot

python-cla-botBot commented Jun 12, 2025•
edited
Loading

Copy link
Copy Markdown

All commit authors signed the Contributor License Agreement.

CLA signed

@cdce8p

cdce8p commented Jun 12, 2025

Copy link
Copy Markdown
Contributor

The following commit authors need to sign the Contributor License Agreement:

Not fully sure what's going on there as I've singed the CLA already. There are a handful of merged PRs from me with the same Github user email, e.g. #130191.

--
This PR should probably also get the backport 3.14 label.

@sobolevnsobolevn added the needs backport to 3.14 bugs and security fixes label Jun 12, 2025
@zware

zware commented Jun 12, 2025

Copy link
Copy Markdown
Member

Not fully sure what's going on there as I've singed the CLA already. There are a handful of merged PRs from me with the same Github user email, e.g. #130191.

Because of the way GitHub messes with authorship on merges, the CLA also needs to be signed for the noted address (I believe there's an option to tie it to a real address for CLA purposes, but this is an area I'm not that familiar with).

@cdce8p

cdce8p commented Jun 12, 2025

Copy link
Copy Markdown
Contributor

Because of the way GitHub messes with authorship on merges, the CLA also needs to be signed for the noted address (I believe there's an option to tie it to a real address for CLA purposes, but this is an area I'm not that familiar with).

Just clicked on the link above and signed it again although I can even see the Legacy PSF Contributor Agreement there too. Oh well 🤷🏻‍♂️ Should be all good now.

@cjw296
cjw296 merged commit c8319a3 into python:mainJun 14, 2025
@miss-islington-app

miss-islington-appBot commented Jun 14, 2025

Copy link
Copy Markdown

Thanks @sobolevn for the PR, and @cjw296 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jun 14, 2025
@sobolevn@cdce8p@miss-islington
pythongh-135368: Fix mocks on dataclass specs withinstance=True(p…
33a0e56
…ythonGH-135421)
* pythongh-135368: Fix mocks on dataclass specs with `instance=True`
* Extend dataclass mock_methods
---------
(cherry picked from commit c8319a3)
Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
@bedevere-app

bedevere-appBot commented Jun 14, 2025

Copy link
Copy Markdown

GH-135503 is a backport of this pull request to the 3.14 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.14 bugs and security fixes label Jun 14, 2025
@cjw296

cjw296 commented Jun 14, 2025

Copy link
Copy Markdown
Contributor

Did this need to go the 3.13 or earlier too?

@sobolevn

sobolevn commented Jun 14, 2025

Copy link
Copy Markdown
MemberAuthor

Thank you! No, #124429 was never backported to 3.13, because it was a new feature.

sobolevn added a commit that referenced this pull request Jun 14, 2025
@miss-islington@sobolevn@cdce8p
[3.14]gh-135368: Fix mocks on dataclass specs withinstance=True(G…
79df5d1
…H-135421) (#135503)
gh-135368: Fix mocks on dataclass specs with `instance=True` (GH-135421)
* gh-135368: Fix mocks on dataclass specs with `instance=True`
* Extend dataclass mock_methods
---------
(cherry picked from commit c8319a3)
Co-authored-by: sobolevn <mail@sobolevn.me>
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
lkollar pushed a commit to lkollar/cpython that referenced this pull request Jun 19, 2025
@sobolevn@cdce8p@lkollar
pythongh-135368: Fix mocks on dataclass specs withinstance=True(p…
b3c6676
…ython#135421)
* pythongh-135368: Fix mocks on dataclass specs with `instance=True`
* Extend dataclass mock_methods
---------
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Pranjal095 pushed a commit to Pranjal095/cpython that referenced this pull request Jul 12, 2025
@sobolevn@cdce8p@Pranjal095
pythongh-135368: Fix mocks on dataclass specs withinstance=True(p…
7b29fff
…ython#135421)
* pythongh-135368: Fix mocks on dataclass specs with `instance=True`
* Extend dataclass mock_methods
---------
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
taegyunkim pushed a commit to taegyunkim/cpython that referenced this pull request Aug 4, 2025
@sobolevn@cdce8p@taegyunkim
pythongh-135368: Fix mocks on dataclass specs withinstance=True(p…
7a10ff9
…ython#135421)
* pythongh-135368: Fix mocks on dataclass specs with `instance=True`
* Extend dataclass mock_methods
---------
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Agent-Hellboy pushed a commit to Agent-Hellboy/cpython that referenced this pull request Aug 19, 2025
@sobolevn@cdce8p@Agent-Hellboy
pythongh-135368: Fix mocks on dataclass specs withinstance=True(p…
1e96105
…ython#135421)
* pythongh-135368: Fix mocks on dataclass specs with `instance=True`
* Extend dataclass mock_methods
---------
Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjw296cjw296cjw296 approved these changes
+1 more reviewer
@cdce8pcdce8pcdce8p approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sobolevn@cdce8p@zware@cjw296