mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #27972: Prohibit Tasks to await on themselves.

Browse source
This commit is contained in:
Yury Selivanov 2016-10-09 12:19:12 -04:00
parent 908d55dd7e
commit 4145c83806
3 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/asyncio/tasks.py
View file

@ -241,7 +241,7 @@ class Task(futures.Future):
result = coro.throw(exc)
except StopIteration as exc:
self.set_result(exc.value)
except futures.CancelledError as exc:
except futures.CancelledError:
super().cancel() # I.e., Future.cancel(self).
except Exception as exc:
self.set_exception(exc)
@ -259,12 +259,19 @@ class Task(futures.Future):
'Task {!r} got Future {!r} attached to a '
'different loop'.format(self, result)))
elif blocking:
result._asyncio_future_blocking = False
result.add_done_callback(self._wakeup)
self._fut_waiter = result
if self._must_cancel:
if self._fut_waiter.cancel():
self._must_cancel = False
if result is self:
self._loop.call_soon(
self._step,
RuntimeError(
'Task cannot await on itself: {!r}'.format(
self)))
else:
result._asyncio_future_blocking = False
result.add_done_callback(self._wakeup)
self._fut_waiter = result
if self._must_cancel:
if self._fut_waiter.cancel():
self._must_cancel = False
else:
self._loop.call_soon(
self._step,