diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-01-29 08:15:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 16:15:36 +0000 |
| commit | 696d2324cf2a54e20e8d6a6739fa97ba815a8be9 (patch) | |
| tree | 0be4b1754264234f0a1bf8a3e02d8c4e9b6643d8 | |
| parent | 2b675f0c8fd96f61977f6dc636f44fbd5587b6b3 (diff) | |
| download | cpython-git-696d2324cf2a54e20e8d6a6739fa97ba815a8be9.tar.gz | |
bpo-39485: fix corner-case in method-detection of mock (GH-18255)
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 a327677905956ae0b239ff430a1346dfe265709e)
Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
Co-authored-by: Carl Friedrich Bolz-Tereick <cfbolz@gmx.de>
| -rw-r--r-- | Lib/unittest/mock.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 66ace80cb5..204b3e7789 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -2715,7 +2715,7 @@ def _must_skip(spec, entry, is_type): continue if isinstance(result, (staticmethod, classmethod)): return False - elif isinstance(getattr(result, '__get__', None), MethodWrapperTypes): + elif isinstance(result, FunctionTypes): # Normal method => skip if looked up on type # (if looked up on instance, self is already skipped) return is_type @@ -2745,10 +2745,6 @@ FunctionTypes = ( type(ANY.__eq__), ) -MethodWrapperTypes = ( - type(ANY.__eq__.__get__), -) - file_spec = None diff --git a/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst b/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst new file mode 100644 index 0000000000..f62c31fc68 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-01-29-14-58-27.bpo-39485.Zy3ot6.rst @@ -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. |