Skip to content

Commit fd512d7

Browse files
vxgmichelasvetlov
authored andcommitted
bpo-35065: Remove StreamReaderProtocol._untrack_reader (#10212)
The call to `_untrack_reader` is performed too soon, causing the protocol to forget about the reader before `connection_lost` can run and feed the EOF to the reader. See bpo-35065.
1 parent 5d95312 commit fd512d7

File tree

4 files changed

+26
-11
lines changed

4 files changed

+26
-11
lines changed

Lib/asyncio/streams.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ def _on_reader_gc(self, wr):
227227
self._reject_connection = True
228228
self._stream_reader_wr = None
229229

230-
def _untrack_reader(self):
231-
self._stream_reader_wr = None
232-
233230
@property
234231
def _stream_reader(self):
235232
if self._stream_reader_wr is None:
@@ -345,9 +342,6 @@ def can_write_eof(self):
345342
return self._transport.can_write_eof()
346343

347344
def close(self):
348-
# a reader can be garbage collected
349-
# after connection closing
350-
self._protocol._untrack_reader()
351345
self._transport.close()
352346

353347
def is_closing(self):

Lib/asyncio/subprocess.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ def __repr__(self):
3636
info.append(f'stderr={self.stderr!r}')
3737
return '<{}>'.format(' '.join(info))
3838

39-
def _untrack_reader(self):
40-
# StreamWriter.close() expects the protocol
41-
# to have this method defined.
42-
pass
43-
4439
def connection_made(self, transport):
4540
self._transport = transport
4641

Lib/test/test_asyncio/test_streams.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@ async def handle_client(self, client_reader, client_writer):
589589
client_writer.write(data)
590590
await client_writer.drain()
591591
client_writer.close()
592+
await client_writer.wait_closed()
592593

593594
def start(self):
594595
sock = socket.socket()
@@ -628,6 +629,7 @@ async def client(addr):
628629
# read it back
629630
msgback = await reader.readline()
630631
writer.close()
632+
await writer.wait_closed()
631633
return msgback
632634

633635
messages = []
@@ -666,6 +668,7 @@ async def handle_client(self, client_reader, client_writer):
666668
client_writer.write(data)
667669
await client_writer.drain()
668670
client_writer.close()
671+
await client_writer.wait_closed()
669672

670673
def start(self):
671674
self.server = self.loop.run_until_complete(
@@ -697,6 +700,7 @@ async def client(path):
697700
# read it back
698701
msgback = await reader.readline()
699702
writer.close()
703+
await writer.wait_closed()
700704
return msgback
701705

702706
messages = []
@@ -987,6 +991,25 @@ def test_async_writer_api(self):
987991

988992
self.assertEqual(messages, [])
989993

994+
def test_eof_feed_when_closing_writer(self):
995+
# See http://bugs.python.org/issue35065
996+
messages = []
997+
self.loop.set_exception_handler(lambda loop, ctx: messages.append(ctx))
998+
999+
with test_utils.run_test_server() as httpd:
1000+
rd, wr = self.loop.run_until_complete(
1001+
asyncio.open_connection(*httpd.address,
1002+
loop=self.loop))
1003+
1004+
f = wr.aclose()
1005+
self.loop.run_until_complete(f)
1006+
assert rd.at_eof()
1007+
f = rd.read()
1008+
data = self.loop.run_until_complete(f)
1009+
assert data == b''
1010+
1011+
self.assertEqual(messages, [])
1012+
9901013

9911014
if __name__ == '__main__':
9921015
unittest.main()
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Remove `StreamReaderProtocol._untrack_reader`. The call to `_untrack_reader`
2+
is currently performed too soon, causing the protocol to forget about the
3+
reader before `connection_lost` can run and feed the EOF to the reader.

0 commit comments

Comments
 (0)