summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@python.org>2020-08-04 02:40:10 +0200
committerGitHub <noreply@github.com>2020-08-04 02:40:10 +0200
commit602a971a2af3a685d625c912c400cadd452718b1 (patch)
tree008054d98cbece7e215c1e95e17b58b35fecd0b8
parentbde48fd8110cc5f128d5db44810d17811e328a24 (diff)
downloadcpython-git-602a971a2af3a685d625c912c400cadd452718b1.tar.gz
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'').
-rw-r--r--Lib/asyncio/windows_events.py2
-rw-r--r--Misc/NEWS.d/next/Library/2020-08-04-00-20-30.bpo-41467.Z8DgTL.rst3
2 files changed, 4 insertions, 1 deletions
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
index c07fe3241c..a6759b78bd 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 0000000000..f12693e117
--- /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''``).