Merge 3.5 (asyncio)

8308db5c · Yury Selivanov · 91f9def4 · 32dae3d5 · 8308db5c
Commit 8308db5c authored May 13, 2016 by Yury Selivanov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Lib/asyncio/streams.py Lib/asyncio/streams.py +7 -4

No files found.
--- a/Lib/asyncio/streams.py
+++ b/Lib/asyncio/streams.py
@@ -242,11 +242,14 @@ class StreamReaderProtocol(FlowControlMixin, protocols.Protocol):
                self._loop.create_task(res)
    def connection_lost(self, exc):
-        if exc is None:
+        if self._stream_reader is not None:
-            self._stream_reader.feed_eof()
+            if exc is None:
-        else:
+                self._stream_reader.feed_eof()
-            self._stream_reader.set_exception(exc)
+            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)