diff options
| -rw-r--r-- | Lib/asyncio/base_futures.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_futures.py | 23 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 27 insertions, 1 deletions
diff --git a/Lib/asyncio/base_futures.py b/Lib/asyncio/base_futures.py index 64f7845..01259a0 100644 --- a/Lib/asyncio/base_futures.py +++ b/Lib/asyncio/base_futures.py @@ -27,7 +27,8 @@ def isfuture(obj): itself as duck-type compatible by setting _asyncio_future_blocking. See comment in Future for more details. """ - return getattr(obj, '_asyncio_future_blocking', None) is not None + return (hasattr(obj.__class__, '_asyncio_future_blocking') and + obj._asyncio_future_blocking is not None) def _format_callbacks(cb): diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py index fd4d261..c147608 100644 --- a/Lib/test/test_asyncio/test_futures.py +++ b/Lib/test/test_asyncio/test_futures.py @@ -105,6 +105,29 @@ class BaseFutureTests: self.loop = self.new_test_loop() self.addCleanup(self.loop.close) + def test_isfuture(self): + class MyFuture: + _asyncio_future_blocking = None + + def __init__(self): + self._asyncio_future_blocking = False + + self.assertFalse(asyncio.isfuture(MyFuture)) + self.assertTrue(asyncio.isfuture(MyFuture())) + self.assertFalse(asyncio.isfuture(1)) + + # As `isinstance(Mock(), Future)` returns `False` + self.assertFalse(asyncio.isfuture(mock.Mock())) + + f = self._new_future(loop=self.loop) + self.assertTrue(asyncio.isfuture(f)) + self.assertFalse(asyncio.isfuture(type(f))) + + # As `isinstance(Mock(Future), Future)` returns `True` + self.assertTrue(asyncio.isfuture(mock.Mock(type(f)))) + + f.cancel() + def test_initial_state(self): f = self._new_future(loop=self.loop) self.assertFalse(f.cancelled()) @@ -25,6 +25,8 @@ Library - Issue #28613: Fix get_event_loop() return the current loop if called from coroutines/callbacks. +- Issue #28634: Fix asyncio.isfuture() to support unittest.Mock. + Documentation ------------- |