diff options
| author | Yury Selivanov <yury@magic.io> | 2017-06-11 13:49:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-11 13:49:18 (GMT) |
| commit | 7ce1c6fb579a01bb184224a10019039fde9c8eaf (patch) | |
| tree | cfae34038438eb189d445bcd6391c9c19607baf7 /Lib/asyncio | |
| parent | 36ff451ebae41f09560bff582c95946474d898f8 (diff) | |
| download | cpython-7ce1c6fb579a01bb184224a10019039fde9c8eaf.zip cpython-7ce1c6fb579a01bb184224a10019039fde9c8eaf.tar.gz cpython-7ce1c6fb579a01bb184224a10019039fde9c8eaf.tar.bz2 | |
bpo-30508: Don't log exceptions if Task/Future "cancel()" method called (#2050)
Diffstat (limited to 'Lib/asyncio')
| -rw-r--r-- | Lib/asyncio/futures.py | 1 | ||||
| -rw-r--r-- | Lib/asyncio/tasks.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Lib/asyncio/futures.py b/Lib/asyncio/futures.py index 39721ea..215f72d 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -107,6 +107,7 @@ class Future: change the future's state to cancelled, schedule the callbacks and return True. """ + self._log_traceback = False if self._state != _PENDING: return False self._state = _CANCELLED diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py index e453300..575d205 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -144,6 +144,7 @@ class Task(futures.Future): terminates with a CancelledError exception (even if cancel() was not called). """ + self._log_traceback = False if self.done(): return False if self._fut_waiter is not None: |