diff options
| author | Yury Selivanov <yury@magic.io> | 2017-06-11 14:00:14 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-11 14:00:14 (GMT) |
| commit | 176f2ebdad93f20876c08efabd364a0e6c86de14 (patch) | |
| tree | 63eaa99f8e662418e60d07fec138f33c3bd504a6 /Lib/asyncio | |
| parent | 59422a29ee3a95866c4f7e037bdfffd5768afddd (diff) | |
| download | cpython-176f2ebdad93f20876c08efabd364a0e6c86de14.zip cpython-176f2ebdad93f20876c08efabd364a0e6c86de14.tar.gz cpython-176f2ebdad93f20876c08efabd364a0e6c86de14.tar.bz2 | |
bpo-30508: Don't log exceptions if Task/Future "cancel()" method was called. (#2109)
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 d11d289..cff9590 100644 --- a/Lib/asyncio/futures.py +++ b/Lib/asyncio/futures.py @@ -191,6 +191,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 d7867d1..9fe2a2f 100644 --- a/Lib/asyncio/tasks.py +++ b/Lib/asyncio/tasks.py @@ -148,6 +148,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: |