Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-39082: Allow AsyncMock to correctly patch static/class methods #18116

Merged
merged 3 commits into from Jan 25, 2020
Merged

bpo-39082: Allow AsyncMock to correctly patch static/class methods #18116

merged 3 commits into from Jan 25, 2020

Conversation

mkokotovich
Copy link
Contributor

@mkokotovich mkokotovich commented Jan 22, 2020 •
edited by bedevere-bot

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@mkokotovich

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

@cjw296
Copy link
Contributor

cjw296 commented Jan 24, 2020

This is an exact duplicate of #17717 so closing.

@cjw296 cjw296 closed this Jan 24, 2020
@mkokotovich
Copy link
Contributor Author

It isn't an exact duplicate, it contains the alternate solution that was provided in the bug report. I'm fine if you all decide to use the other solution, but I wanted to get this one out there too to make it easier to decide.

@cjw296 cjw296 reopened this Jan 24, 2020
@cjw296
Copy link
Contributor

cjw296 commented Jan 24, 2020 •
edited

Terribly sorry, I missed that. I think this actually has @tirkarthi's suggestion which I'd be inclined to go with. Would you be able to add a NEWS entry so I can merge this?

@cjw296 cjw296 mentioned this pull request Jan 24, 2020
Closed
@mkokotovich
Copy link
Contributor Author

Let me know if I didn't do that correctly, but I added a NEWS entry.

lisroach
lisroach reviewed Jan 24, 2020
View reviewed changes
Misc/NEWS.d/next/Library/2020-01-24-13-24-35.bpo-39082.qKgrq_.rst Outdated
@@ -0,0 +1 @@
Allow AsyncMock to correcly patch static/class methods
Copy link
Contributor

Choose a reason for hiding this comment

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

correcly -> correctly :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks!

@mkokotovich mkokotovich changed the title bpo-39082: Allow AsyncMock to correcly patch static/class methods bpo-39082: Allow AsyncMock to correctly patch static/class methods Jan 24, 2020
@cjw296 cjw296 merged commit 62865f4 into python:master Jan 25, 2020
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry, @mkokotovich and @cjw296, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 62865f4532094017a9b780b704686ca9734bc329 3.7

@miss-islington
Copy link
Contributor

Sorry @mkokotovich and @cjw296, I had trouble checking out the 3.8 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 62865f4532094017a9b780b704686ca9734bc329 3.8

@tirkarthi
Copy link
Member

AsyncMock is 3.8+ feature so I have removed the label. @mkokotovich Thanks for the PR. As noted there seems to be a merge conflict and you can follow the commands noted by miss-islington to create a backport fixing conflicts for 3.8.

mkokotovich added a commit to mkokotovich/cpython that referenced this pull request Jan 26, 2020
@mkokotovich
[3.8] bpo-39082: Allow AsyncMock to correctly patch static/class meth…
dc0f690 
…ods (pythonGH-18116)

(cherry picked from commit 62865f4)

Co-authored-by: Matthew Kokotovich <mkokotovich@gmail.com>
@bedevere-bot
Copy link

GH-18190 is a backport of this pull request to the 3.8 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.8 only security fixes label Jan 26, 2020
shihai1991 pushed a commit to shihai1991/cpython that referenced this pull request Jan 31, 2020
@mkokotovich @shihai1991
bpo-39082: Allow AsyncMock to correctly patch static/class methods (p…
2ae78a5 
…ythonGH-18116)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lisroach lisroach lisroach left review comments

@cjw296 cjw296 cjw296 approved these changes

Assignees

@cjw296 cjw296

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@mkokotovich @the-knights-who-say-ni @cjw296 @miss-islington @tirkarthi @bedevere-bot @lisroach