Commit9682602

Carl Meyer

authored and

facebook-github-bot

committed

restore Mock._spec_asyncs and match upstream

Summary:D42039568 (733b7b3) backported an early version ofpython/cpython#100252,and there were some changes made before that PR was merged upstream.Backport those changes so we match upstream behavior. Most importantly,this restores `_spec_asyncs`, which although a private API does seem to be used.Reviewed By: itamaroDifferential Revision: D42416767fbshipit-source-id:a7e7a21

1 parent6002c4b commit9682602Copy full SHA for 9682602

File tree

1 file changed

+10

-3

lines changed

Lib/unittest
- mock.py

1 file changed

+10

-3

lines changed

`‎Lib/unittest/mock.py‎`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -493,6 +493,7 @@ def _mock_add_spec(self, spec, spec_set, _spec_as_instance=False,`
`493`	`493`	`_eat_self=False):`
`494`	`494`	`_spec_class=None`
`495`	`495`	`_spec_signature=None`
	`496`	`+_spec_asyncs= []`
`496`	`497`
`497`	`498`	`ifspecisnotNoneandnot_is_list(spec):`
`498`	`499`	`ifisinstance(spec,type):`
`@@ -503,13 +504,20 @@ def _mock_add_spec(self, spec, spec_set, _spec_as_instance=False,`
`503`	`504`	`_spec_as_instance,_eat_self)`
`504`	`505`	`_spec_signature=resandres[1]`
`505`	`506`
`506`		`-spec=dir(spec)`
	`507`	`+spec_list=dir(spec)`
	`508`	`+`
	`509`	`+forattrinspec_list:`
	`510`	`+ifiscoroutinefunction(getattr(spec,attr,None)):`
	`511`	`+_spec_asyncs.append(attr)`
	`512`	`+`
	`513`	`+spec=spec_list`
`507`	`514`
`508`	`515`	`__dict__=self.__dict__`
`509`	`516`	`__dict__['_spec_class']=_spec_class`
`510`	`517`	`__dict__['_spec_set']=spec_set`
`511`	`518`	`__dict__['_spec_signature']=_spec_signature`
`512`	`519`	`__dict__['_mock_methods']=spec`
	`520`	`+__dict__['_spec_asyncs']=_spec_asyncs`
`513`	`521`
`514`	`522`	`def__get_return_value(self):`
`515`	`523`	`ret=self._mock_return_value`
`@@ -998,8 +1006,7 @@ def _get_child_mock(self, /, **kw):`
`998`	`1006`	`For non-callable mocks the callable variant will be used (rather than`
`999`	`1007`	`any custom subclass)."""`
`1000`	`1008`	`_new_name=kw.get("_new_name")`
`1001`		`-_spec_val=getattr(self.__dict__["_spec_class"],_new_name,None)`
`1002`		`-if_spec_valisnotNoneandasyncio.iscoroutinefunction(_spec_val):`
	`1009`	`+if_new_nameinself.__dict__['_spec_asyncs']:`
`1003`	`1010`	`returnAsyncMock(**kw)`
`1004`	`1011`
`1005`	`1012`	`ifself._mock_sealed:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9682602

File tree

1 file changed

1 file changed

`‎Lib/unittest/mock.py‎`

0 commit comments