Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

bpo-31647: Fix write_eof() after close() for SelectorSocketTransport (GH-7149)

Browse source 
Fixed bug where calling write_eof() on a _SelectorSocketTransport after
it's already closed raises AttributeError.
This commit is contained in:
twisteroid ambassador 2018-05-28 23:16:45 +08:00 • committed by Yury Selivanov
parent 35230d08e0
commit 23f587e395
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/asyncio/selector_events.py
View file

@ -899,7 +899,7 @@ def _write_ready(self):
self._sock.shutdown(socket.SHUT_WR) self._sock.shutdown(socket.SHUT_WR)
def write_eof(self): def write_eof(self):
if self._eof: if self._closing or self._eof:
return return
self._eof = True self._eof = True
if not self._buffer: if not self._buffer:

6
Lib/test/test_asyncio/test_selector_events.py
View file

@ -1263,6 +1263,12 @@ def test_write_eof_buffer(self):
self.sock.shutdown.assert_called_with(socket.SHUT_WR) self.sock.shutdown.assert_called_with(socket.SHUT_WR)
tr.close() tr.close()
def test_write_eof_after_close(self):
tr = self.socket_transport()
tr.close()
self.loop.run_until_complete(asyncio.sleep(0))
tr.write_eof()
@mock.patch('asyncio.base_events.logger') @mock.patch('asyncio.base_events.logger')
def test_transport_close_remove_writer(self, m_log): def test_transport_close_remove_writer(self, m_log):
remove_writer = self.loop._remove_writer = mock.Mock() remove_writer = self.loop._remove_writer = mock.Mock()

2
Misc/NEWS.d/next/Library/2018-05-28-18-40-26.bpo-31467.s4Fad3.rst Normal file
View file

@ -0,0 +1,2 @@
Fixed bug where calling write_eof() on a _SelectorSocketTransport after it's
already closed raises AttributeError.