diff options
| -rw-r--r-- | Lib/asyncio/selector_events.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Lib/asyncio/selector_events.py b/Lib/asyncio/selector_events.py index 00e3244..e1abf51 100644 --- a/Lib/asyncio/selector_events.py +++ b/Lib/asyncio/selector_events.py @@ -348,6 +348,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): The maximum amount of data to be received at once is specified by nbytes. """ + if isinstance(sock, ssl.SSLSocket): + raise TypeError("Socket cannot be of type SSLSocket") if self._debug and sock.gettimeout() != 0: raise ValueError("the socket must be non-blocking") try: @@ -386,6 +388,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): The received data is written into *buf* (a writable buffer). The return value is the number of bytes written. """ + if isinstance(sock, ssl.SSLSocket): + raise TypeError("Socket cannot be of type SSLSocket") if self._debug and sock.gettimeout() != 0: raise ValueError("the socket must be non-blocking") try: @@ -425,6 +429,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): raised, and there is no way to determine how much data, if any, was successfully processed by the receiving end of the connection. """ + if isinstance(sock, ssl.SSLSocket): + raise TypeError("Socket cannot be of type SSLSocket") if self._debug and sock.gettimeout() != 0: raise ValueError("the socket must be non-blocking") try: @@ -472,6 +478,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): This method is a coroutine. """ + if isinstance(sock, ssl.SSLSocket): + raise TypeError("Socket cannot be of type SSLSocket") if self._debug and sock.gettimeout() != 0: raise ValueError("the socket must be non-blocking") @@ -533,6 +541,8 @@ class BaseSelectorEventLoop(base_events.BaseEventLoop): 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. """ + if isinstance(sock, ssl.SSLSocket): + raise TypeError("Socket cannot be of type SSLSocket") if self._debug and sock.gettimeout() != 0: raise ValueError("the socket must be non-blocking") fut = self.create_future() diff --git a/Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst b/Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst new file mode 100644 index 0000000..067fc9d --- /dev/null +++ b/Misc/NEWS.d/next/Build/2019-12-01-21-45-24.bpo-37404.cNsA7S.rst @@ -0,0 +1,2 @@ +:mod:`asyncio` now raises :exc:`TyperError` when calling incompatible methods +with an :class:`ssl.SSLSocket` socket. Patch by Ido Michael. |