Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/asyncio/selector_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -1198,8 +1198,13 @@ def writelines(self, list_of_data):
return

for data in list_of_data:
# gh-155888: an empty chunk can never be drained, so never buffer it
if not data:
continue
self._buffer.append(memoryview(data))
self._buffer_size += len(data)
if not self._buffer:
return
self._write_ready()
# If the entire buffer couldn't be written, register a write handler
if self._buffer:
Expand Down
13 changes: 13 additions & 0 deletions Lib/test/test_asyncio/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,19 @@ def writer(data):
r.close()
self.assertEqual(read, data)

def test_writelines_empty_chunk(self):
# gh-155888: an empty chunk can never be drained, so never buffer it
rsock, wsock = socket.socketpair()
self.addCleanup(rsock.close)

async def main():
reader, writer = await asyncio.open_connection(sock=wsock)
writer.writelines([b'data', b''])
writer.close()
await asyncio.wait_for(writer.wait_closed(), support.SHORT_TIMEOUT)

self.loop.run_until_complete(main())

@unittest.skipUnless(hasattr(signal, 'SIGKILL'), 'No SIGKILL')
def test_add_signal_handler(self):
caught = 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :meth:`asyncio.WriteTransport.writelines` hanging the transport when the
last data chunk is empty.
Loading