Skip to content

Conversation

@tirkarthi
Copy link
Member

@tirkarthi tirkarthi commented Sep 12, 2019

Copy link
Contributor

@mangrisano mangrisano left a comment

Choose a reason for hiding this comment

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

LGTM.

Copy link
Contributor

@cjw296 cjw296 left a comment

Choose a reason for hiding this comment

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

Great, but the news entry needs some work, not sure my interpretation is correct?

@@ -0,0 +1,3 @@
Ensure ``wraps`` is supplied to :class:`unittest.mock.MagicMock` is used to
calculate return values for the magic methods instead of using the default
Copy link
Contributor

Choose a reason for hiding this comment

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

"Ensure, if wraps is supplied to :class:unittest.mock.MagicMock, it is used to" maybe?

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks Chris, updated.

@bedevere-bot
Copy link

When you're done making the requested changes, leave the comment: I have made the requested changes; please review again.

@tirkarthi
Copy link
Member Author

I have made the requested changes; please review again

@bedevere-bot
Copy link

Thanks for making the requested changes!

@cjw296: please review the changes made to this pull request.

@bedevere-bot bedevere-bot requested a review from cjw296 January 26, 2020 16:42
@cjw296 cjw296 merged commit 72b1004 into python:master Jan 27, 2020
@bedevere-bot
Copy link

@cjw296: Please replace # with GH- in the commit message next time. Thanks!

@tirkarthi
Copy link
Member Author

Thanks Chris :)

shihai1991 pushed a commit to shihai1991/cpython that referenced this pull request Jan 31, 2020
tirkarthi added a commit to tirkarthi/cpython that referenced this pull request Apr 27, 2020
cjw296 pushed a commit that referenced this pull request Apr 28, 2020
…magic methods in MagicMock" (GH-19734)

* Revert "bpo-25597: Ensure wraps' return value is used for magic methods in MagicMock (#16029)"

This reverts commit 72b1004.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants