summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYury Selivanov <yselivanov@sprymix.com>2016-05-13 19:59:48 (GMT)
committerYury Selivanov <yselivanov@sprymix.com>2016-05-13 19:59:48 (GMT)
commit8308db5cd56f0a3ec33759bf482563be37bcd648 (patch)
tree50efe7f9c086caa049804c8eb186391bdf26f35c
parent91f9def4281202a63e2bd94cae586cf3708bafdd (diff)
parent32dae3d50ff8f3ab5cbb36df476844ed41deb103 (diff)
downloadcpython-8308db5cd56f0a3ec33759bf482563be37bcd648.zip
cpython-8308db5cd56f0a3ec33759bf482563be37bcd648.tar.gz
cpython-8308db5cd56f0a3ec33759bf482563be37bcd648.tar.bz2
Merge 3.5 (asyncio)
-rw-r--r--Lib/asyncio/streams.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/Lib/asyncio/streams.py b/Lib/asyncio/streams.py
index 0008d51..b7b0485 100644
--- 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:
- 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)