Skip to content

/ cpython

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.

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

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
+26 −0

Conversation

@mkokotovich
Copy link
Contributor

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

https://bugs.python.org/issue39082
@mkokotovich
bpo-39082: Allow AsyncMock to correcly patch static/class methods
Loading status checks…
74a063a
@the-knights-who-say-ni

This comment has been minimized.

Sign in to view
Copy link

the-knights-who-say-ni commented Jan 22, 2020

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!
@mkokotovich mkokotovich requested a review from lisroach Jan 22, 2020
@cjw296

This comment has been minimized.

Sign in to view
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

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

mkokotovich commented Jan 24, 2020

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

This comment has been minimized.

Sign in to view
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
added NEWS entry
Loading status checks…
ff16a46
@mkokotovich

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

mkokotovich commented Jan 24, 2020

Let me know if I didn't do that correctly, but I added a NEWS entry.
@lisroach
lisroach reviewed Jan 24, 2020
View 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

This comment has been minimized.

Sign in to view
Copy link
@lisroach

lisroach Jan 24, 2020

Contributor

correcly -> correctly :)

This comment has been minimized.

Sign in to view
Copy link
@mkokotovich

mkokotovich Jan 24, 2020

Author Contributor

Thanks!
@mkokotovich
mkokotovich reviewed Jan 24, 2020
View changes
Misc/NEWS.d/next/Library/2020-01-24-13-24-35.bpo-39082.qKgrq_.rst Outdated Show resolved Hide resolved
@mkokotovich
Update Misc/NEWS.d/next/Library/2020-01-24-13-24-35.bpo-39082.qKgrq_.rst
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
34af56d
@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 approved these changes Jan 25, 2020
View changes
@cjw296 cjw296 merged commit 62865f4 into python:master Jan 25, 2020
9 checks passed
9 checks passed
Docs
Details
Windows (x86)
Details
Windows (x64)
Details
macOS
Details
Ubuntu
Details
Azure Pipelines PR #20200124.43 succeeded
Details
bedevere/issue-number Issue number 39082 found
Details
bedevere/news News entry found in Misc/NEWS.d
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@miss-islington

This comment has been minimized.

Sign in to view
Copy link

miss-islington commented Jan 25, 2020

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

This comment has been minimized.

Sign in to view
Copy link

miss-islington commented Jan 25, 2020

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

This comment has been minimized.

Sign in to view
Copy link

miss-islington commented Jan 25, 2020

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

This comment has been minimized.

Sign in to view
Copy link

miss-islington commented Jan 25, 2020

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

This comment has been minimized.

Sign in to view
Copy link
Member

tirkarthi commented Jan 25, 2020

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

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Jan 26, 2020

GH-18190 is a backport of this pull request to the 3.8 branch.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lisroach lisroach

@cjw296 cjw296

Assignees

@cjw296 cjw296

Labels
CLA signed
Projects
None yet
Milestone
No milestone
7 participants
@mkokotovich @the-knights-who-say-ni @cjw296 @miss-islington @tirkarthi @bedevere-bot @lisroach
You can’t perform that action at this time.