diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-15 12:16:50 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-15 12:16:50 (GMT) |
commit | 41ed958ee6f0ff15836e11013d1cada8c3ae90fc (patch) | |
tree | 90c7799305553685e0b91cd91edf97768a080421 /Lib | |
parent | 7e222f411cda575c336eaabbc4aa4d5b8addab89 (diff) | |
download | cpython-41ed958ee6f0ff15836e11013d1cada8c3ae90fc.zip cpython-41ed958ee6f0ff15836e11013d1cada8c3ae90fc.tar.gz cpython-41ed958ee6f0ff15836e11013d1cada8c3ae90fc.tar.bz2 |
Issue #23243: Fix asyncio._UnixWritePipeTransport.close()
Do nothing if the transport is already closed. Before it was not possible to
close the transport twice.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/asyncio/unix_events.py | 2 | ||||
-rw-r--r-- | Lib/test/test_asyncio/test_unix_events.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index 14b4843..9f4005c 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -516,7 +516,7 @@ class _UnixWritePipeTransport(transports._FlowControlMixin, self._loop.call_soon(self._call_connection_lost, None) def close(self): - if not self._closing: + if self._pipe is not None and not self._closing: # write_eof is all what we needed to close the write pipe self.write_eof() diff --git a/Lib/test/test_asyncio/test_unix_events.py b/Lib/test/test_asyncio/test_unix_events.py index 5f4b024..4a68ce3 100644 --- a/Lib/test/test_asyncio/test_unix_events.py +++ b/Lib/test/test_asyncio/test_unix_events.py @@ -766,6 +766,9 @@ class UnixWritePipeTransportTests(test_utils.TestCase): tr.close() tr.write_eof.assert_called_with() + # closing the transport twice must not fail + tr.close() + def test_close_closing(self): tr = unix_events._UnixWritePipeTransport( self.loop, self.pipe, self.protocol) |