diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-08-04 00:58:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 00:58:06 (GMT) |
| commit | b934d832d1e16bf235c536dcde3006faf29757fc (patch) | |
| tree | 7cb02734b1ebc5c6ec20bed4fb5f47d377df3f33 | |
| parent | 4bc8445c392e22fb926eeea50d3e943b6241affa (diff) | |
| download | cpython-b934d832d1e16bf235c536dcde3006faf29757fc.zip cpython-b934d832d1e16bf235c536dcde3006faf29757fc.tar.gz cpython-b934d832d1e16bf235c536dcde3006faf29757fc.tar.bz2 | |
bpo-41467: Fix asyncio recv_into() on Windows (GH-21720)
On Windows, fix asyncio recv_into() return value when the socket/pipe
is closed (BrokenPipeError): return 0 rather than an empty byte
string (b'').
(cherry picked from commit 602a971a2af3a685d625c912c400cadd452718b1)
Co-authored-by: Victor Stinner <vstinner@python.org>
| -rw-r--r-- | Lib/asyncio/windows_events.py | 2 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-08-04-00-20-30.bpo-41467.Z8DgTL.rst | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index ac51109..12e87ab 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -469,7 +469,7 @@ class IocpProactor: else: ov.ReadFileInto(conn.fileno(), buf) except BrokenPipeError: - return self._result(b'') + return self._result(0) def finish_recv(trans, key, ov): try: diff --git a/Misc/NEWS.d/next/Library/2020-08-04-00-20-30.bpo-41467.Z8DgTL.rst b/Misc/NEWS.d/next/Library/2020-08-04-00-20-30.bpo-41467.Z8DgTL.rst new file mode 100644 index 0000000..f12693e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-08-04-00-20-30.bpo-41467.Z8DgTL.rst @@ -0,0 +1,3 @@ +On Windows, fix asyncio ``recv_into()`` return value when the socket/pipe is +closed (:exc:`BrokenPipeError`): return ``0`` rather than an empty byte +string (``b''``). |