traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-39485: fix corner-case in method-detection of mock (GH-18252) 

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 commit is contained in:
Carl Friedrich Bolz-Tereick 2020-01-29 16:43:37 +01:00 committed by GitHub
parent 3cb49b62e6
commit a327677905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/unittest/mock.py
View File

@ -2748,7 +2748,7 @@ def _must_skip(spec, entry, is_type):
continue continue
if isinstance(result, (staticmethod, classmethod)): if isinstance(result, (staticmethod, classmethod)):
return False return False
elif isinstance(getattr(result, '__get__', None), MethodWrapperTypes): elif isinstance(result, FunctionTypes):
# Normal method => skip if looked up on type # Normal method => skip if looked up on type
# (if looked up on instance, self is already skipped) # (if looked up on instance, self is already skipped)
return is_type return is_type
@ -2778,10 +2778,6 @@ FunctionTypes = (
type(ANY.__eq__), type(ANY.__eq__),
) )
MethodWrapperTypes = (
type(ANY.__eq__.__get__),
)
file_spec = None file_spec = None

3
Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst Normal file
View File

@ -0,0 +1,3 @@
Fix a bug in :func:`unittest.mock.create_autospec` that would complain about
the wrong number of arguments for custom descriptors defined in an extension
module returning functions.