[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (asyncio)

[victor.stinner]

https://hg.python.org/cpython/rev/c00be209bccf
changeset:   94143:c00be209bccf
parent:      94141:0c5ae257966f
parent:      94142:42f4dfc6c6a9
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Jan 14 17:13:43 2015 +0100
summary:
  Merge 3.4 (asyncio)

files:
  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
--- 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
 

-- 
Repository URL: https://hg.python.org/cpython