]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-96127: Fix `inspect.signature` call on mocks (#96335)
authorNikita Sobolev <mail@sobolevn.me>
Sat, 7 Jan 2023 10:49:15 +0000 (13:49 +0300)
committerGitHub <noreply@github.com>
Sat, 7 Jan 2023 10:49:15 +0000 (10:49 +0000)
Lib/test/test_inspect.py
Lib/unittest/mock.py
Misc/NEWS.d/next/Library/2022-08-27-10-35-50.gh-issue-96127.8RdLre.rst [new file with mode: 0644]

index 1b589c8df2a224cb8e68271d3f9dc93112311bd5..aa757241aca9e19d2944dd0ccaa76c90f691343e 100644 (file)
@@ -3283,6 +3283,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)
index b3c0e28c698b44cb74097c5bd832666faac2b3f2..0f93cb53c3d5cea6f6a3d065ca4e18c453a1e688 100644 (file)
@@ -2217,7 +2217,15 @@ class AsyncMockMixin(Base):
         code_mock = NonCallableMock(spec_set=_CODE_ATTRS)
         code_mock.__dict__["_spec_class"] = CodeType
         code_mock.__dict__["_spec_signature"] = _CODE_SIG
-        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 (file)
index 0000000..79edd8f
--- /dev/null
@@ -0,0 +1,2 @@
+``inspect.signature`` was raising ``TypeError`` on call with mock objects.
+Now it correctly returns ``(*args, **kwargs)`` as infered signature.