Commit 49d6b8c0 authored by Yury Selivanov's avatar Yury Selivanov

Issue #28634: Fix asyncio.isfuture() to support mocks

parent 3b3a141a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
__all__ = ['CancelledError', 'TimeoutError', __all__ = ['CancelledError', 'TimeoutError',
'InvalidStateError', 'InvalidStateError',
'Future', 'wrap_future', 'Future', 'wrap_future', 'isfuture',
] ]
import concurrent.futures._base import concurrent.futures._base
...@@ -117,7 +117,8 @@ def isfuture(obj): ...@@ -117,7 +117,8 @@ def isfuture(obj):
itself as duck-type compatible by setting _asyncio_future_blocking. itself as duck-type compatible by setting _asyncio_future_blocking.
See comment in Future for more details. 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: class Future:
......
...@@ -101,6 +101,29 @@ class FutureTests(test_utils.TestCase): ...@@ -101,6 +101,29 @@ class FutureTests(test_utils.TestCase):
self.loop = self.new_test_loop() self.loop = self.new_test_loop()
self.addCleanup(self.loop.close) 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): def test_initial_state(self):
f = asyncio.Future(loop=self.loop) f = asyncio.Future(loop=self.loop)
self.assertFalse(f.cancelled()) self.assertFalse(f.cancelled())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment