Staging
v0.5.1
v0.5.1
https://github.com/python/cpython
Revision cf0645a17acbc0c4dbbf82434e37637965748bbb authored by Miss Islington (bot) on 29 January 2020, 16:10:24 UTC, committed by GitHub on 29 January 2020, 16:10:24 UTC
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>
1 parent a6559b4
Tip revision: cf0645a17acbc0c4dbbf82434e37637965748bbb authored by Miss Islington (bot) on 29 January 2020, 16:10:24 UTC
bpo-39485: fix corner-case in method-detection of mock (GH-18256)
bpo-39485: fix corner-case in method-detection of mock (GH-18256)
Tip revision: cf0645a
| File | Mode | Size |
|---|---|---|
| clinic | ||
| Python-ast.c | -rw-r--r-- | 260.2 KB |
| README | -rw-r--r-- | 62 bytes |
| _warnings.c | -rw-r--r-- | 37.4 KB |
| asdl.c | -rw-r--r-- | 1.4 KB |
| ast.c | -rw-r--r-- | 160.4 KB |
| ast_opt.c | -rw-r--r-- | 23.8 KB |
| ast_unparse.c | -rw-r--r-- | 24.1 KB |
| bltinmodule.c | -rw-r--r-- | 83.7 KB |
| bootstrap_hash.c | -rw-r--r-- | 18.2 KB |
| ceval.c | -rw-r--r-- | 159.8 KB |
| ceval_gil.h | -rw-r--r-- | 9.0 KB |
| codecs.c | -rw-r--r-- | 44.8 KB |
| compile.c | -rw-r--r-- | 157.8 KB |
| condvar.h | -rw-r--r-- | 8.9 KB |
| context.c | -rw-r--r-- | 28.5 KB |
| dtoa.c | -rw-r--r-- | 77.8 KB |
| dup2.c | -rw-r--r-- | 759 bytes |
| dynamic_annotations.c | -rw-r--r-- | 6.6 KB |
| dynload_aix.c | -rw-r--r-- | 5.7 KB |
| dynload_dl.c | -rw-r--r-- | 581 bytes |
| dynload_hpux.c | -rw-r--r-- | 1.9 KB |
| dynload_shlib.c | -rw-r--r-- | 3.3 KB |
| dynload_stub.c | -rw-r--r-- | 186 bytes |
| dynload_win.c | -rw-r--r-- | 10.0 KB |
| errors.c | -rw-r--r-- | 32.9 KB |
| fileutils.c | -rw-r--r-- | 49.1 KB |
| formatter_unicode.c | -rw-r--r-- | 50.2 KB |
| frozen.c | -rw-r--r-- | 1.7 KB |
| frozenmain.c | -rw-r--r-- | 2.9 KB |
| future.c | -rw-r--r-- | 5.0 KB |
| getargs.c | -rw-r--r-- | 75.9 KB |
| getcompiler.c | -rw-r--r-- | 538 bytes |
| getcopyright.c | -rw-r--r-- | 511 bytes |
| getopt.c | -rw-r--r-- | 4.4 KB |
| getplatform.c | -rw-r--r-- | 133 bytes |
| getversion.c | -rw-r--r-- | 308 bytes |
| graminit.c | -rw-r--r-- | 44.0 KB |
| hamt.c | -rw-r--r-- | 78.9 KB |
| import.c | -rw-r--r-- | 64.6 KB |
| importdl.c | -rw-r--r-- | 7.2 KB |
| importdl.h | -rw-r--r-- | 487 bytes |
| importlib.h | -rw-r--r-- | 96.4 KB |
| importlib_external.h | -rw-r--r-- | 139.5 KB |
| makeopcodetargets.py | -rwxr-xr-x | 1.6 KB |
| marshal.c | -rw-r--r-- | 50.2 KB |
| modsupport.c | -rw-r--r-- | 16.9 KB |
| mysnprintf.c | -rw-r--r-- | 3.3 KB |
| mystrtoul.c | -rw-r--r-- | 8.1 KB |
| opcode_targets.h | -rw-r--r-- | 6.3 KB |
| pathconfig.c | -rw-r--r-- | 10.8 KB |
| peephole.c | -rw-r--r-- | 18.4 KB |
| pyarena.c | -rw-r--r-- | 5.5 KB |
| pyctype.c | -rw-r--r-- | 7.7 KB |
| pyfpe.c | -rw-r--r-- | 345 bytes |
| pyhash.c | -rw-r--r-- | 13.2 KB |
| pylifecycle.c | -rw-r--r-- | 67.9 KB |
| pymath.c | -rw-r--r-- | 1.6 KB |
| pystate.c | -rw-r--r-- | 32.6 KB |
| pystrcmp.c | -rw-r--r-- | 613 bytes |
| pystrhex.c | -rw-r--r-- | 1.7 KB |
| pystrtod.c | -rw-r--r-- | 40.1 KB |
| pythonrun.c | -rw-r--r-- | 43.8 KB |
| pytime.c | -rw-r--r-- | 26.3 KB |
| strdup.c | -rw-r--r-- | 277 bytes |
| structmember.c | -rw-r--r-- | 8.6 KB |
| symtable.c | -rw-r--r-- | 57.5 KB |
| sysmodule.c | -rw-r--r-- | 81.6 KB |
| thread.c | -rw-r--r-- | 5.3 KB |
| thread_nt.h | -rw-r--r-- | 11.2 KB |
| thread_pthread.h | -rw-r--r-- | 21.5 KB |
| traceback.c | -rw-r--r-- | 24.4 KB |
| wordcode_helpers.h | -rw-r--r-- | 1.2 KB |
Computing file changes ...
