[3.10] Raise TypeError if SSLSocket is passed to asyncio transport-based methods (GH-31442). (GH-31443)

(cherry picked from commit 1f9d4c93af)

Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
This commit is contained in:
Andrew Svetlov 2022-02-20 14:45:02 +02:00 committed by GitHub
parent ea3e0421b0
commit dde048819f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 10 deletions

View file

@ -40,11 +40,6 @@ def _test_selector_event(selector, fd, event):
return bool(key.events & event)
def _check_ssl_socket(sock):
if ssl is not None and isinstance(sock, ssl.SSLSocket):
raise TypeError("Socket cannot be of type SSLSocket")
class BaseSelectorEventLoop(base_events.BaseEventLoop):
"""Selector event loop.
@ -357,7 +352,7 @@ async def sock_recv(self, sock, n):
The maximum amount of data to be received at once is specified by
nbytes.
"""
_check_ssl_socket(sock)
base_events._check_ssl_socket(sock)
if self._debug and sock.gettimeout() != 0:
raise ValueError("the socket must be non-blocking")
try:
@ -398,7 +393,7 @@ async def sock_recv_into(self, sock, buf):
The received data is written into *buf* (a writable buffer).
The return value is the number of bytes written.
"""
_check_ssl_socket(sock)
base_events._check_ssl_socket(sock)
if self._debug and sock.gettimeout() != 0:
raise ValueError("the socket must be non-blocking")
try:
@ -439,7 +434,7 @@ async def sock_sendall(self, sock, data):
raised, and there is no way to determine how much data, if any, was
successfully processed by the receiving end of the connection.
"""
_check_ssl_socket(sock)
base_events._check_ssl_socket(sock)
if self._debug and sock.gettimeout() != 0:
raise ValueError("the socket must be non-blocking")
try:
@ -488,7 +483,7 @@ async def sock_connect(self, sock, address):
This method is a coroutine.
"""
_check_ssl_socket(sock)
base_events._check_ssl_socket(sock)
if self._debug and sock.gettimeout() != 0:
raise ValueError("the socket must be non-blocking")
@ -553,7 +548,7 @@ async def sock_accept(self, sock):
object usable to send and receive data on the connection, and address
is the address bound to the socket on the other end of the connection.
"""
_check_ssl_socket(sock)
base_events._check_ssl_socket(sock)
if self._debug and sock.gettimeout() != 0:
raise ValueError("the socket must be non-blocking")
fut = self.create_future()