bpo-37251: Removes __code__ check from _is_async_obj. (GH-15830)
(cherry picked from commit f1a297acb60b88917712450ebd3cfa707e6efd6b)
Co-authored-by: Lisa Roach <lisaroach14@gmail.com>
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py
index 915883d..7bfbfc9 100644
--- a/Lib/unittest/mock.py
+++ b/Lib/unittest/mock.py
@@ -46,10 +46,9 @@
_safe_super = super
def _is_async_obj(obj):
- if getattr(obj, '__code__', None):
- return asyncio.iscoroutinefunction(obj) or inspect.isawaitable(obj)
- else:
+ if _is_instance_mock(obj) and not isinstance(obj, AsyncMock):
return False
+ return asyncio.iscoroutinefunction(obj) or inspect.isawaitable(obj)
def _is_async_func(func):
diff --git a/Lib/unittest/test/testmock/testasync.py b/Lib/unittest/test/testmock/testasync.py
index fa906e4..4660bea 100644
--- a/Lib/unittest/test/testmock/testasync.py
+++ b/Lib/unittest/test/testmock/testasync.py
@@ -18,6 +18,10 @@
def normal_method(self):
pass
+class AwaitableClass:
+ def __await__(self):
+ yield
+
async def async_func():
pass
@@ -160,6 +164,10 @@
with self.assertRaises(RuntimeError):
create_autospec(async_func, instance=True)
+ def test_create_autospec_awaitable_class(self):
+ awaitable_mock = create_autospec(spec=AwaitableClass())
+ self.assertIsInstance(create_autospec(awaitable_mock), AsyncMock)
+
def test_create_autospec(self):
spec = create_autospec(async_func_args)
awaitable = spec(1, 2, c=3)
@@ -321,6 +329,13 @@
self.assertIsInstance(mock.normal_method, MagicMock)
self.assertIsInstance(mock, MagicMock)
+ def test_magicmock_lambda_spec(self):
+ mock_obj = MagicMock()
+ mock_obj.mock_func = MagicMock(spec=lambda x: x)
+
+ with patch.object(mock_obj, "mock_func") as cm:
+ self.assertIsInstance(cm, MagicMock)
+
class AsyncArguments(unittest.TestCase):
def test_add_return_value(self):