Merge 3.4 (asyncio)

2015-01-14 17:13:43 +01:00 · 2015-01-14 17:13:43 +01:00 · 24be20ac1c
parent a5e881d2e8 b92626df5c
commit 24be20ac1c
1 changed files with 2 additions and 1 deletions
--- 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