| commit | 24be20ac1c396a961d5546d3a641fbcc0bc8108b | [log] [tgz] |
|---|---|---|
| author | Victor Stinner <victor.stinner@gmail.com> | Wed Jan 14 17:13:43 2015 +0100 |
| committer | Victor Stinner <victor.stinner@gmail.com> | Wed Jan 14 17:13:43 2015 +0100 |
| tree | 69141ffb9f5e1b0b30d8474fadf11dc4f04be89a | |
| parent | a5e881d2e8ad7e91ff801a02be9de924705d9a6e [diff] | |
| parent | b92626df5ca72d25236404a0a62cf47279c4e503 [diff] |
Merge 3.4 (asyncio)
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 @@ "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