diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/asyncio/futures.py | 5 | ||||
| -rw-r--r-- | Lib/test/test_asyncio/test_futures.py | 23 |
2 files changed, 26 insertions, 2 deletions
diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py index bcd4d16..9ca8d84 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -2,7 +2,7 @@ __all__ = ['CancelledError', 'TimeoutError', 'InvalidStateError', - 'Future', 'wrap_future', + 'Future', 'wrap_future', 'isfuture', ] import concurrent.futures._base @@ -117,7 +117,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) class Future: diff --git a/Lib/test/test_asyncio/test_futures.py b/Lib/test/test_asyncio/test_futures.py index 153b8ed..c306b77 100644 --- a/Lib/test/test_asyncio/test_futures.py +++ b/Lib/test/test_asyncio/test_futures.py @@ -101,6 +101,29 @@ class FutureTests(test_utils.TestCase): 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)) + self.assertFalse(asyncio.isfuture(asyncio.Future)) + + # As `isinstance(Mock(), Future)` returns `False` + self.assertFalse(asyncio.isfuture(mock.Mock())) + + # As `isinstance(Mock(Future), Future)` returns `True` + self.assertTrue(asyncio.isfuture(mock.Mock(asyncio.Future))) + + f = asyncio.Future(loop=self.loop) + self.assertTrue(asyncio.isfuture(f)) + f.cancel() + def test_initial_state(self): f = asyncio.Future(loop=self.loop) self.assertFalse(f.cancelled()) |