Staging
v0.8.1
v0.8.1
https://github.com/python/cpython
Revision a327677905956ae0b239ff430a1346dfe265709e authored by Carl Friedrich Bolz-Tereick on 29 January 2020, 15:43:37 UTC, committed by GitHub on 29 January 2020, 15:43:37 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.
1 parent 3cb49b6
Tip revision: a327677905956ae0b239ff430a1346dfe265709e authored by Carl Friedrich Bolz-Tereick on 29 January 2020, 15:43:37 UTC
bpo-39485: fix corner-case in method-detection of mock (GH-18252)
bpo-39485: fix corner-case in method-detection of mock (GH-18252)
Tip revision: a327677
| File | Mode | Size |
|---|---|---|
| .azure-pipelines | ||
| .github | ||
| Doc | ||
| Grammar | ||
| Include | ||
| Lib | ||
| Mac | ||
| Misc | ||
| Modules | ||
| Objects | ||
| PC | ||
| PCbuild | ||
| Parser | ||
| Programs | ||
| Python | ||
| Tools | ||
| m4 | ||
| .gitattributes | -rw-r--r-- | 1.8 KB |
| .gitignore | -rw-r--r-- | 1.8 KB |
| .travis.yml | -rw-r--r-- | 8.1 KB |
| CODE_OF_CONDUCT.md | -rw-r--r-- | 630 bytes |
| LICENSE | -rw-r--r-- | 12.5 KB |
| Makefile.pre.in | -rw-r--r-- | 66.5 KB |
| README.rst | -rw-r--r-- | 9.9 KB |
| aclocal.m4 | -rw-r--r-- | 10.7 KB |
| config.guess | -rwxr-xr-x | 43.1 KB |
| config.sub | -rwxr-xr-x | 35.4 KB |
| configure | -rwxr-xr-x | 494.1 KB |
| configure.ac | -rw-r--r-- | 164.8 KB |
| install-sh | -rwxr-xr-x | 15.0 KB |
| netlify.toml | -rw-r--r-- | 82 bytes |
| pyconfig.h.in | -rw-r--r-- | 44.0 KB |
| setup.py | -rw-r--r-- | 101.7 KB |
Computing file changes ...
