mirror of
https://github.com/python/cpython.git
synced 2025-10-10 00:43:41 +00:00
[3.6] bpo-29403: Fix mock's broken autospec behavior on method-bound builtin functions (GH-3)
Cython will, in the right circumstances, offer a MethodType instance
where im_func is a builtin function. Any instance of MethodType is
automatically assumed to be a Python-defined function (more
specifically, a function that has an inspectable signature), but
_set_signature was still conservative in its assumptions. As a result
_set_signature would return early with None instead of a mock since
the im_func had no inspectable signature. This causes problems
deeper inside mock, as _set_signature is assumed to _always_
return a mock, and nothing checked its return value.
In similar corner cases, autospec will simply not check the spec of the
function, so _set_signature is amended to now return early with the
original, not-wrapped mock object.
Patch by Aaron Gallagher.
(cherry picked from commit 856cbcc12f
)
This commit is contained in:
parent
bb323b261d
commit
64b9a15886
3 changed files with 18 additions and 1 deletions
|
@ -165,7 +165,7 @@ def _set_signature(mock, original, instance=False):
|
|||
skipfirst = isinstance(original, type)
|
||||
result = _get_signature_object(original, instance, skipfirst)
|
||||
if result is None:
|
||||
return
|
||||
return mock
|
||||
func, sig = result
|
||||
def checksig(*args, **kwargs):
|
||||
sig.bind(*args, **kwargs)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue