cleanup

Author: blink1073

justfile

@@ -2,7 +2,7 @@
 set shell := ["bash", "-c"]
 
 # Commonly used command segments.
-uv_run := "uv run --isolated --frozen "
+uv_run := "uv run --frozen "
 typing_run := uv_run + "--group typing --extra aws --extra encryption --extra ocsp --extra snappy --extra test --extra zstd"
 docs_run := uv_run + "--extra docs"
 doc_build := "./doc/_build"

pymongo/network_layer.py

@@ -41,9 +41,8 @@
 from pymongo.socket_checker import _errno_from_exception
 
 if TYPE_CHECKING:
-    from ssl import SSLSocket
-
     from pymongo.asynchronous.pool import AsyncBaseConnection
+    from pymongo.pyopenssl_context import _sslConn
     from pymongo.synchronous.pool import BaseConnection
 
 _UNPACK_HEADER = struct.Struct("<iiii").unpack
@@ -60,7 +59,7 @@
 )
 
 
-def sendall(sock: Union[socket.socket, SSLSocket], buf: bytes) -> None:
+def sendall(sock: Union[socket.socket, _sslConn], buf: bytes) -> None:
     sock.sendall(buf)
 
 
@@ -222,7 +221,7 @@ def sock(self) -> socket.socket:
 
 
 class NetworkingInterface(NetworkingInterfaceBase):
-    def __init__(self, conn: Union[socket.socket, SSLSocket]):
+    def __init__(self, conn: Union[socket.socket, _sslConn]):
         super().__init__(conn)
 
     def gettimeout(self) -> float | None:
@@ -238,11 +237,11 @@ def is_closing(self) -> bool:
         return self.conn.is_closing()
 
     @property
-    def get_conn(self) -> Union[socket.socket, SSLSocket]:
+    def get_conn(self) -> Union[socket.socket, _sslConn]:
         return self.conn
 
     @property
-    def sock(self) -> Union[socket.socket, SSLSocket]:
+    def sock(self) -> Union[socket.socket, _sslConn]:
         return self.conn
 
     def fileno(self) -> int:
@@ -553,7 +552,7 @@ def buffer_updated(self, nbytes: int) -> None:
         waiter = self._pending_listeners.popleft()
         waiter.set_result(data)
 
-    def _read(self, bytes_needed):
+    def _read(self, bytes_needed: int) -> memoryview:
         """Read bytes from the buffer."""
         # Send the bytes to the listener.
         if self._bytes_ready < bytes_needed:
@@ -581,7 +580,7 @@ def _read(self, bytes_needed):
                 ]
                 out_index += buffer_remaining
                 n_remaining -= buffer_remaining
-        return output_buf
+        return memoryview(output_buf)
 
 
 async def async_sendall(conn: PyMongoBaseProtocol, buf: bytes) -> None:

pymongo/pool_shared.py

@@ -16,7 +16,6 @@
 from __future__ import annotations
 
 import asyncio
-import functools
 import socket
 import ssl
 import sys
@@ -25,7 +24,6 @@
     Any,
     NoReturn,
     Optional,
-    Union,
 )
 
 from pymongo import _csot
@@ -47,7 +45,6 @@
 
 SSLErrors = (PYSSLError, SSLError)
 if TYPE_CHECKING:
-    from pymongo.pyopenssl_context import _sslConn
     from pymongo.typings import _Address
 
 try:
@@ -274,64 +271,10 @@ async def _async_create_connection(address: _Address, options: PoolOptions) -> s
         raise OSError("getaddrinfo failed")
 
 
-async def _async_configured_socket(
-    address: _Address, options: PoolOptions
-) -> Union[socket.socket, _sslConn]:
-    """Given (host, port) and PoolOptions, return a raw configured socket.
-
-    Can raise socket.error, ConnectionFailure, or _CertificateError.
-
-    Sets socket's SSL and timeout options.
-    """
-    sock = await _async_create_connection(address, options)
-    ssl_context = options._ssl_context
-
-    if ssl_context is None:
-        sock.settimeout(options.socket_timeout)
-        return sock
-
-    host = address[0]
-    try:
-        # We have to pass hostname / ip address to wrap_socket
-        # to use SSLContext.check_hostname.
-        if _has_sni(False):
-            loop = asyncio.get_running_loop()
-            ssl_sock = await loop.run_in_executor(
-                None,
-                functools.partial(ssl_context.wrap_socket, sock, server_hostname=host),  # type: ignore[assignment, misc, unused-ignore]
-            )
-        else:
-            loop = asyncio.get_running_loop()
-            ssl_sock = await loop.run_in_executor(None, ssl_context.wrap_socket, sock)  # type: ignore[assignment, misc, unused-ignore]
-    except _CertificateError:
-        sock.close()
-        # Raise _CertificateError directly like we do after match_hostname
-        # below.
-        raise
-    except (OSError, *SSLErrors) as exc:
-        sock.close()
-        # We raise AutoReconnect for transient and permanent SSL handshake
-        # failures alike. Permanent handshake failures, like protocol
-        # mismatch, will be turned into ServerSelectionTimeoutErrors later.
-        details = _get_timeout_details(options)
-        _raise_connection_failure(address, exc, "SSL handshake failed: ", timeout_details=details)
-    if (
-        ssl_context.verify_mode
-        and not ssl_context.check_hostname
-        and not options.tls_allow_invalid_hostnames
-    ):
-        try:
-            ssl.match_hostname(ssl_sock.getpeercert(), hostname=host)  # type:ignore[attr-defined, unused-ignore]
-        except _CertificateError:
-            ssl_sock.close()
-            raise
-
-    ssl_sock.settimeout(options.socket_timeout)
-    return ssl_sock
-
-
 async def _configured_protocol_interface(
-    address: _Address, options: PoolOptions, protocol_kls: PyMongoBaseProtocol = PyMongoProtocol
+    address: _Address,
+    options: PoolOptions,
+    protocol_kls: type[PyMongoBaseProtocol] = PyMongoProtocol,
 ) -> AsyncNetworkingInterface:
     """Given (host, port) and PoolOptions, return a configured AsyncNetworkingInterface.
 
@@ -455,55 +398,6 @@ def _create_connection(address: _Address, options: PoolOptions) -> socket.socket
         raise OSError("getaddrinfo failed")
 
 
-def _configured_socket(address: _Address, options: PoolOptions) -> Union[socket.socket, _sslConn]:
-    """Given (host, port) and PoolOptions, return a raw configured socket.
-
-    Can raise socket.error, ConnectionFailure, or _CertificateError.
-
-    Sets socket's SSL and timeout options.
-    """
-    sock = _create_connection(address, options)
-    ssl_context = options._ssl_context
-
-    if ssl_context is None:
-        sock.settimeout(options.socket_timeout)
-        return sock
-
-    host = address[0]
-    try:
-        # We have to pass hostname / ip address to wrap_socket
-        # to use SSLContext.check_hostname.
-        if _has_sni(True):
-            ssl_sock = ssl_context.wrap_socket(sock, server_hostname=host)  # type: ignore[assignment, misc, unused-ignore]
-        else:
-            ssl_sock = ssl_context.wrap_socket(sock)  # type: ignore[assignment, misc, unused-ignore]
-    except _CertificateError:
-        sock.close()
-        # Raise _CertificateError directly like we do after match_hostname
-        # below.
-        raise
-    except (OSError, *SSLErrors) as exc:
-        sock.close()
-        # We raise AutoReconnect for transient and permanent SSL handshake
-        # failures alike. Permanent handshake failures, like protocol
-        # mismatch, will be turned into ServerSelectionTimeoutErrors later.
-        details = _get_timeout_details(options)
-        _raise_connection_failure(address, exc, "SSL handshake failed: ", timeout_details=details)
-    if (
-        ssl_context.verify_mode
-        and not ssl_context.check_hostname
-        and not options.tls_allow_invalid_hostnames
-    ):
-        try:
-            ssl.match_hostname(ssl_sock.getpeercert(), hostname=host)  # type:ignore[attr-defined, unused-ignore]
-        except _CertificateError:
-            ssl_sock.close()
-            raise
-
-    ssl_sock.settimeout(options.socket_timeout)
-    return ssl_sock
-
-
 def _configured_socket_interface(
     address: _Address, options: PoolOptions, *args: Any
 ) -> NetworkingInterface:

tools/synchro.py

@@ -123,7 +123,6 @@
     "async_receive_kms": "receive_kms",
     "AsyncNetworkingInterface": "NetworkingInterface",
     "_configured_protocol_interface": "_configured_socket_interface",
-    "_async_configured_socket": "_configured_socket",
     "SpecRunnerTask": "SpecRunnerThread",
     "AsyncMockConnection": "MockConnection",
     "AsyncMockPool": "MockPool",