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

miss-islington · twisteroidambassador · Yury Selivanov · commit 7e8819a589c7 · 2018-05-28T16:25:03.000-04:00
Fixed bug where calling write_eof() on a _SelectorSocketTransport after it's already closed raises AttributeError. (cherry picked from commit 23f587e) Co-authored-by: twisteroid ambassador <twisteroidambassador@users.noreply.github.com>
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py
@@ -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:
diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py
@@ -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()
diff --git a/Misc/NEWS.d/next/Library/2018-05-28-18-40-26.bpo-31467.s4Fad3.rst b/Misc/NEWS.d/next/Library/2018-05-28-18-40-26.bpo-31467.s4Fad3.rst
@@ -0,0 +1,2 @@
+Fixed bug where calling write_eof() on a _SelectorSocketTransport after it's
+already closed raises AttributeError.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fixed bug where calling write_eof() on a _SelectorSocketTransport after it's`
	`2`	`+already closed raises AttributeError.`