From 0ac3a0cd7932079724aaabbb0a078e1c17129068 Mon Sep 17 00:00:00 2001 From: Yury Selivanov Date: Fri, 11 Dec 2015 11:33:59 -0500 Subject: asyncio: Make Tasks check if Futures are attached to the same event loop See https://github.com/python/asyncio/pull/303 for details --- Lib/asyncio/tasks.py | 8 +++++++- Lib/test/test_asyncio/test_tasks.py | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index e6389d8..a2ab881 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -251,7 +251,13 @@ class Task(futures.Future): else: if isinstance(result, futures.Future): # Yielded Future must come from Future.__iter__(). - if result._blocking: + if result._loop is not self._loop: + self._loop.call_soon( + self._step, + RuntimeError( + 'Task {!r} got Future {!r} attached to a ' + 'different loop'.format(self, result))) + elif result._blocking: result._blocking = False result.add_done_callback(self._wakeup) self._fut_waiter = result diff --git a/Lib/test/test_asyncio/test_tasks.py b/Lib/test/test_asyncio/test_tasks.py index 04d19ac..47b17d1 100644 --- a/Lib/test/test_asyncio/test_tasks.py +++ b/Lib/test/test_asyncio/test_tasks.py @@ -76,6 +76,21 @@ class TaskTests(test_utils.TestCase): def setUp(self): self.loop = self.new_test_loop() + def test_other_loop_future(self): + other_loop = asyncio.new_event_loop() + fut = asyncio.Future(loop=other_loop) + + @asyncio.coroutine + def run(fut): + yield from fut + + try: + with self.assertRaisesRegex(RuntimeError, + r'Task .* got Future .* attached'): + self.loop.run_until_complete(run(fut)) + finally: + other_loop.close() + def test_task_class(self): @asyncio.coroutine def notmuch(): -- cgit v0.12