Skip to content

[3.6] bpo-31647: Fix write_eof() after close() for SelectorSocketTransport (GH-7149) #7154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1st1 merged 1 commit into from
May 28, 2018
Merged

[3.6] bpo-31647: Fix write_eof() after close() for SelectorSocketTransport (GH-7149) #7154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Lib/asyncio/selector_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ def _write_ready(self):
self._sock.shutdown(socket.SHUT_WR)

def write_eof(self):
if self._eof:
if self._closing or self._eof:
return
self._eof = True
if not self._buffer:
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_asyncio/test_selector_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,12 @@ def test_write_eof_buffer(self):
self.sock.shutdown.assert_called_with(socket.SHUT_WR)
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')
def test_transport_close_remove_writer(self, m_log):
remove_writer = self.loop._remove_writer = mock.Mock()
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-05-28-18-40-26.bpo-31467.s4Fad3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fixed bug where calling write_eof() on a _SelectorSocketTransport after it's
already closed raises AttributeError.