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

yury.selivanov python-checkins at python.org
Fri May 13 16:00:29 EDT 2016


https://hg.python.org/cpython/rev/aa75eae23949
changeset:   101326:aa75eae23949
parent:      101324:8327937f256d
parent:      101325:d1479e05ed0f
user:        Yury Selivanov <yselivanov at sprymix.com>
date:        Fri May 13 15:59:48 2016 -0400
summary:
  Merge 3.5 (asyncio)

files:
  Lib/asyncio/streams.py |  11 +++++++----
  1 files changed, 7 insertions(+), 4 deletions(-)


diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py
--- a/Lib/asyncio/streams.py
+++ b/Lib/asyncio/streams.py
@@ -242,11 +242,14 @@
                 self._loop.create_task(res)
 
     def connection_lost(self, exc):
-        if exc is None:
-            self._stream_reader.feed_eof()
-        else:
-            self._stream_reader.set_exception(exc)
+        if self._stream_reader is not None:
+            if exc is None:
+                self._stream_reader.feed_eof()
+            else:
+                self._stream_reader.set_exception(exc)
         super().connection_lost(exc)
+        self._stream_reader = None
+        self._stream_writer = None
 
     def data_received(self, data):
         self._stream_reader.feed_data(data)

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


More information about the Python-checkins mailing list