From efcab386990576338f318f1adc839bbc694fa87e Mon Sep 17 00:00:00 2001 From: Oleg Iarygin Date: Wed, 8 Feb 2023 14:05:57 +0400 Subject: [3.11] gh-96127: Fix `inspect.signature` call on mocks (#96335) (#101646) (cherry picked from commit 9e7d7266ecdcccc02385fe4ccb094f3444102e26) Co-authored-by: Nikita Sobolev --- Lib/test/test_inspect.py | 19 +++++++++++++++++++ Lib/unittest/mock.py | 10 +++++++++- .../2022-08-27-10-35-50.gh-issue-96127.8RdLre.rst | 2 ++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2022-08-27-10-35-50.gh-issue-96127.8RdLre.rst diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index 9ea4985..c504860 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -3238,6 +3238,25 @@ class TestSignatureObject(unittest.TestCase): ((('a', 10, ..., "positional_or_keyword"),), ...)) + def test_signature_on_mocks(self): + # https://github.com/python/cpython/issues/96127 + for mock in ( + unittest.mock.Mock(), + unittest.mock.AsyncMock(), + unittest.mock.MagicMock(), + ): + with self.subTest(mock=mock): + self.assertEqual(str(inspect.signature(mock)), '(*args, **kwargs)') + + def test_signature_on_noncallable_mocks(self): + for mock in ( + unittest.mock.NonCallableMock(), + unittest.mock.NonCallableMagicMock(), + ): + with self.subTest(mock=mock): + with self.assertRaises(TypeError): + inspect.signature(mock) + def test_signature_equality(self): def foo(a, *, b:int) -> float: pass self.assertFalse(inspect.signature(foo) == 42) diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index fa0bd91..54bd3ec 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -2201,7 +2201,15 @@ class AsyncMockMixin(Base): self.__dict__['_mock_await_args'] = None self.__dict__['_mock_await_args_list'] = _CallList() code_mock = NonCallableMock(spec_set=CodeType) - code_mock.co_flags = inspect.CO_COROUTINE + code_mock.co_flags = ( + inspect.CO_COROUTINE + + inspect.CO_VARARGS + + inspect.CO_VARKEYWORDS + ) + code_mock.co_argcount = 0 + code_mock.co_varnames = ('args', 'kwargs') + code_mock.co_posonlyargcount = 0 + code_mock.co_kwonlyargcount = 0 self.__dict__['__code__'] = code_mock self.__dict__['__name__'] = 'AsyncMock' self.__dict__['__defaults__'] = tuple() diff --git a/Misc/NEWS.d/next/Library/2022-08-27-10-35-50.gh-issue-96127.8RdLre.rst b/Misc/NEWS.d/next/Library/2022-08-27-10-35-50.gh-issue-96127.8RdLre.rst new file mode 100644 index 0000000..79edd8f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2022-08-27-10-35-50.gh-issue-96127.8RdLre.rst @@ -0,0 +1,2 @@ +``inspect.signature`` was raising ``TypeError`` on call with mock objects. +Now it correctly returns ``(*args, **kwargs)`` as infered signature. -- cgit v0.12