https://github.com/python/cpython/commit/cf3bba3f0671d2c9fee099e3ab0f78b98b176131
commit: cf3bba3f0671d2c9fee099e3ab0f78b98b176131
branch: main
author: Kirill Podoprigora <[email protected]>
committer: gvanrossum <[email protected]>
date: 2024-06-01T09:05:19-07:00
summary:
gh-113892: Add a extra check to `ProactorEventLoop.sock_connect` to ensure that
the given socket is in non-blocking mode (#119519)
files:
A Misc/NEWS.d/next/Library/2024-05-24-21-54-55.gh-issue-113892.JKDFqq.rst
M Lib/asyncio/proactor_events.py
M Lib/test/test_asyncio/test_proactor_events.py
diff --git a/Lib/asyncio/proactor_events.py b/Lib/asyncio/proactor_events.py
index 397a8cda757895..7eb55bd63ddb73 100644
--- a/Lib/asyncio/proactor_events.py
+++ b/Lib/asyncio/proactor_events.py
@@ -721,6 +721,8 @@ async def sock_sendto(self, sock, data, address):
return await self._proactor.sendto(sock, data, 0, address)
async def sock_connect(self, sock, address):
+ if self._debug and sock.gettimeout() != 0:
+ raise ValueError("the socket must be non-blocking")
return await self._proactor.connect(sock, address)
async def sock_accept(self, sock):
diff --git a/Lib/test/test_asyncio/test_proactor_events.py
b/Lib/test/test_asyncio/test_proactor_events.py
index fcaa2f6ade2b76..4b3d551dd7b3a2 100644
--- a/Lib/test/test_asyncio/test_proactor_events.py
+++ b/Lib/test/test_asyncio/test_proactor_events.py
@@ -1018,9 +1018,9 @@ def setUp(self):
self.addCleanup(self.file.close)
super().setUp()
- def make_socket(self, cleanup=True):
+ def make_socket(self, cleanup=True, blocking=False):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- sock.setblocking(False)
+ sock.setblocking(blocking)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 1024)
sock.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 1024)
if cleanup:
@@ -1082,6 +1082,11 @@ def test_sock_sendfile_not_regular_file(self):
0, None))
self.assertEqual(self.file.tell(), 0)
+ def test_blocking_socket(self):
+ self.loop.set_debug(True)
+ sock = self.make_socket(blocking=True)
+ with self.assertRaisesRegex(ValueError, "must be non-blocking"):
+ self.run_loop(self.loop.sock_sendfile(sock, self.file))
if __name__ == '__main__':
unittest.main()
diff --git
a/Misc/NEWS.d/next/Library/2024-05-24-21-54-55.gh-issue-113892.JKDFqq.rst
b/Misc/NEWS.d/next/Library/2024-05-24-21-54-55.gh-issue-113892.JKDFqq.rst
new file mode 100644
index 00000000000000..639d5abe878344
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-05-24-21-54-55.gh-issue-113892.JKDFqq.rst
@@ -0,0 +1,3 @@
+Now, the method ``sock_connect`` of :class:`asyncio.ProactorEventLoop`
+raises a :exc:`ValueError` if given socket is not in
+non-blocking mode, as well as in other loop implementations.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
