bpo-39966: Revert "bpo-25597: Ensure wraps' return value is used for magic methods in MagicMock (#16029)" #19734
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ds in MagicMock (python#16029)" This reverts commit 72b1004.
cjw296
reviewed
Apr 28, 2020
| obj = klass() | ||
| self.assertEqual(obj.__getitem__(2), 2) | ||
| self.assertEqual(obj.__custom_method__(), "foo") | ||
|
|
There was a problem hiding this comment.
How about leaving these tests in, but change their expectations and add comments as to why things are the way they are and how they would be in a perfect world?
There was a problem hiding this comment.
Usually reversions do a git revert of commit fixing conflicts and add a NEWS entry as needed if the change was released. I guess these can be added back as part of a separate tests only PR. I am new to doing a reversion so feel free to correct me if I am wrong.
There was a problem hiding this comment.
If cpython hadn't chose squashing commits as their appoach, I'd suggest doing the revert in one commit and then add the tests back in another commit.
However, given that squashing is the choice cpython has made, it makes little difference.
Maybe two commits in this PR which will get squashed down to one on merge?
There was a problem hiding this comment.
Okay, I have added back the test and added some comments referencing the issue.
| @@ -0,0 +1,2 @@ | |||
| Revert bpo-25597. :class:`unittest.mock.MagicMock` with wraps' set uses | |||
| default return values for magic methods. | |||
There was a problem hiding this comment.
Not sure we need this if the new item is removed above?
There was a problem hiding this comment.
The change was published as part of an alpha release. So my belief with respect to reversion after a release is that someone might depend on it and to explicitly note tbe reversion as a NEWS entry from past reversions I looked in git log.
There was a problem hiding this comment.
Agreed, but perhaps that means the original news item should stay too? It's a little confusing to have a reference to a bpo that isn't anywhere else in the changelog.
There was a problem hiding this comment.
Makes sense, added it back. Each alpha has a separate section and it reads like added in alpha 4 to be reverted by alpha 6. If anyone has concern or feedback later I will change it.
cjw296
approved these changes
Apr 28, 2020
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reverts commit 72b1004.
https://bugs.python.org/issue39966