diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-14 16:13:43 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-14 16:13:43 (GMT) |
| commit | 24be20ac1c396a961d5546d3a641fbcc0bc8108b (patch) | |
| tree | 69141ffb9f5e1b0b30d8474fadf11dc4f04be89a /Lib/asyncio/selector_events.py | |
| parent | a5e881d2e8ad7e91ff801a02be9de924705d9a6e (diff) | |
| parent | b92626df5ca72d25236404a0a62cf47279c4e503 (diff) | |
| download | cpython-24be20ac1c396a961d5546d3a641fbcc0bc8108b.zip cpython-24be20ac1c396a961d5546d3a641fbcc0bc8108b.tar.gz cpython-24be20ac1c396a961d5546d3a641fbcc0bc8108b.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/selector_events.py')
| -rw-r--r-- | Lib/asyncio/selector_events.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index ca86264..074a8df 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -774,7 +774,8 @@ class _SelectorSslTransport(_SelectorTransport): "on matching the hostname", self, exc_info=True) 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) return |