diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-14 17:00:29 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-14 17:00:29 +0100 |
| commit | f6641188171be65039da2aad93458c19676990cc (patch) | |
| tree | b0ef6e8a0569f892d0fc65a34979b4f00d72d4b7 /Lib/asyncio/selector_events.py | |
| parent | 923e06f77d7cd3c998913568128e8a41c55136bd (diff) | |
| parent | 177e9f0855ca398bf208a7466ed288e2ae22f6d5 (diff) | |
| download | cpython-git-f6641188171be65039da2aad93458c19676990cc.tar.gz | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/selector_events.py')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index b2f29c706a..ca86264886 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -750,7 +750,7 @@ class _SelectorSslTransport(_SelectorTransport): self._loop.remove_reader(self._sock_fd) self._loop.remove_writer(self._sock_fd) self._sock.close() - if self._waiter is not None: + if self._waiter is not None and not self._waiter.cancelled(): self._waiter.set_exception(exc) if isinstance(exc, Exception): return |