Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.
Sign upbpo-39485: fix corner-case in method-detection of mock #18252
Merged
+4
−5
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
woops, messed something up, fixing... |
Replace check for whether something is a method in the mock module. The previous version fails on PyPy, because there no method wrappers exist (everything looks like a regular Python-defined function). Thus the isinstance(getattr(result, '__get__', None), MethodWrapperTypes) check returns True for any descriptor, not just methods. This condition could also return erroneously True in CPython for C-defined descriptors. Instead to decide whether something is a method, just check directly whether it's a function defined on the class. This passes all tests on CPython and fixes the bug on PyPy.
This comment has been minimized.
This comment has been minimized.
|
better now |
cjw296
merged commit a327677
into
python:master
9 checks passed
9 checks passed
bedevere/news
News entry found in Misc/NEWS.d
This comment has been minimized.
This comment has been minimized.
miss-islington
commented
Jan 29, 2020
miss-islington
added a commit
to miss-islington/cpython
that referenced
this pull request
Jan 29, 2020
Replace check for whether something is a method in the mock module. The previous version fails on PyPy, because there no method wrappers exist (everything looks like a regular Python-defined function). Thus the isinstance(getattr(result, '__get__', None), MethodWrapperTypes) check returns True for any descriptor, not just methods. This condition could also return erroneously True in CPython for C-defined descriptors. Instead to decide whether something is a method, just check directly whether it's a function defined on the class. This passes all tests on CPython and fixes the bug on PyPy. (cherry picked from commit a327677) Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
This comment has been minimized.
This comment has been minimized.
bedevere-bot
commented
Jan 29, 2020
|
GH-18255 is a backport of this pull request to the 3.8 branch. |
This comment has been minimized.
This comment has been minimized.
miss-islington
commented
Jan 29, 2020
miss-islington
added a commit
to miss-islington/cpython
that referenced
this pull request
Jan 29, 2020
Replace check for whether something is a method in the mock module. The previous version fails on PyPy, because there no method wrappers exist (everything looks like a regular Python-defined function). Thus the isinstance(getattr(result, '__get__', None), MethodWrapperTypes) check returns True for any descriptor, not just methods. This condition could also return erroneously True in CPython for C-defined descriptors. Instead to decide whether something is a method, just check directly whether it's a function defined on the class. This passes all tests on CPython and fixes the bug on PyPy. (cherry picked from commit a327677) Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
This comment has been minimized.
This comment has been minimized.
bedevere-bot
commented
Jan 29, 2020
|
GH-18256 is a backport of this pull request to the 3.7 branch. |
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.
cfbolz commentedJan 29, 2020
•
edited by bedevere-bot
As described in the issue, replace check for whether something is a method in the mock module. The
previous version fails on PyPy, because there no method wrappers exist (everything looks like a regular Python-defined function). Thus the
isinstance(getattr(result, '__get__', None), MethodWrapperTypes)check returnsTruefor any descriptor, not just methods.This condition could also return erronously
Truein CPython for C-defined descriptors.Instead to decide whether something is a method, just check directly whether it's a function defined on the class. This passes all tests on CPython and fixes the bug on PyPy.
/cc @cjw296
https://bugs.python.org/issue39485