fix test errors

Author: sleepyStick

pymongo/network_layer.py

@@ -46,22 +46,21 @@
     _HAVE_SSL = False
 
 try:
-    from pymongo.pyopenssl_context import (
-        BLOCKING_IO_LOOKUP_ERROR,
-        BLOCKING_IO_READ_ERROR,
-        BLOCKING_IO_WRITE_ERROR,
-        _sslConn,
-    )
+    from pymongo.pyopenssl_context import _sslConn as _pysslConn
 
     _HAVE_PYOPENSSL = True
 except ImportError:
     _HAVE_PYOPENSSL = False
-    _sslConn = SSLSocket  # type: ignore
-    from pymongo.ssl_support import (  # type: ignore[assignment]
-        BLOCKING_IO_LOOKUP_ERROR,
-        BLOCKING_IO_READ_ERROR,
-        BLOCKING_IO_WRITE_ERROR,
-    )
+    _pysslCon = SSLSocket
+
+from pymongo.ssl_support import (  # type: ignore[assignment]
+    BLOCKING_IO_LOOKUP_ERROR,
+    BLOCKING_IO_READ_ERROR,
+    BLOCKING_IO_WRITE_ERROR,
+    PYBLOCKING_IO_LOOKUP_ERROR,
+    PYBLOCKING_IO_READ_ERROR,
+    PYBLOCKING_IO_WRITE_ERROR,
+)
 
 if TYPE_CHECKING:
     from pymongo.asynchronous.pool import AsyncConnection
@@ -71,17 +70,23 @@
 _UNPACK_COMPRESSION_HEADER = struct.Struct("<iiB").unpack
 _POLL_TIMEOUT = 0.5
 # Errors raised by sockets (and TLS sockets) when in non-blocking mode.
-BLOCKING_IO_ERRORS = (BlockingIOError, BLOCKING_IO_LOOKUP_ERROR, *ssl_support.BLOCKING_IO_ERRORS)
+BLOCKING_IO_ERRORS = (
+    BlockingIOError,
+    BLOCKING_IO_LOOKUP_ERROR,
+    PYBLOCKING_IO_LOOKUP_ERROR,
+    *ssl_support.BLOCKING_IO_ERRORS,
+    *ssl_support.PYBLOCKING_IO_ERRORS,
+)
 
 
 # These socket-based I/O methods are for KMS requests and any other network operations that do not use
 # the MongoDB wire protocol
-async def async_socket_sendall(sock: Union[socket.socket, _sslConn], buf: bytes) -> None:
+async def async_socket_sendall(sock: Union[socket.socket, _pysslConn], buf: bytes) -> None:
     timeout = sock.gettimeout()
     sock.settimeout(0.0)
     loop = asyncio.get_running_loop()
     try:
-        if _HAVE_SSL and isinstance(sock, (SSLSocket, _sslConn)):
+        if _HAVE_SSL and isinstance(sock, (SSLSocket, _pysslConn)):
             await asyncio.wait_for(_async_socket_sendall_ssl(sock, buf, loop), timeout=timeout)
         else:
             await asyncio.wait_for(loop.sock_sendall(sock, buf), timeout=timeout)  # type: ignore[arg-type]
@@ -95,7 +100,7 @@ async def async_socket_sendall(sock: Union[socket.socket, _sslConn], buf: bytes)
 if sys.platform != "win32":
 
     async def _async_socket_sendall_ssl(
-        sock: Union[socket.socket, _sslConn], buf: bytes, loop: AbstractEventLoop
+        sock: Union[socket.socket, _pysslConn], buf: bytes, loop: AbstractEventLoop
     ) -> None:
         view = memoryview(buf)
         sent = 0
@@ -113,21 +118,23 @@ def _is_ready(fut: Future) -> None:
                 # Check for closed socket.
                 if fd == -1:
                     raise SSLError("Underlying socket has been closed") from None
-                if isinstance(exc, BLOCKING_IO_READ_ERROR):
+                if isinstance(exc, (BLOCKING_IO_READ_ERROR, PYBLOCKING_IO_READ_ERROR)):
                     fut = loop.create_future()
                     loop.add_reader(fd, _is_ready, fut)
                     try:
                         await fut
                     finally:
                         loop.remove_reader(fd)
-                if isinstance(exc, BLOCKING_IO_WRITE_ERROR):
+                if isinstance(exc, (BLOCKING_IO_WRITE_ERROR, PYBLOCKING_IO_WRITE_ERROR)):
                     fut = loop.create_future()
                     loop.add_writer(fd, _is_ready, fut)
                     try:
                         await fut
                     finally:
                         loop.remove_writer(fd)
-                if _HAVE_PYOPENSSL and isinstance(exc, BLOCKING_IO_LOOKUP_ERROR):
+                if _HAVE_PYOPENSSL and isinstance(
+                    exc, (BLOCKING_IO_LOOKUP_ERROR, PYBLOCKING_IO_LOOKUP_ERROR)
+                ):
                     fut = loop.create_future()
                     loop.add_reader(fd, _is_ready, fut)
                     try:
@@ -138,7 +145,7 @@ def _is_ready(fut: Future) -> None:
                         loop.remove_writer(fd)
 
     async def _async_socket_receive_ssl(
-        conn: _sslConn, length: int, loop: AbstractEventLoop, once: Optional[bool] = False
+        conn: _pysslConn, length: int, loop: AbstractEventLoop, once: Optional[bool] = False
     ) -> memoryview:
         mv = memoryview(bytearray(length))
         total_read = 0
@@ -162,21 +169,23 @@ def _is_ready(fut: Future) -> None:
                 # Check for closed socket.
                 if fd == -1:
                     raise SSLError("Underlying socket has been closed") from None
-                if isinstance(exc, BLOCKING_IO_READ_ERROR):
+                if isinstance(exc, (BLOCKING_IO_READ_ERROR, PYBLOCKING_IO_READ_ERROR)):
                     fut = loop.create_future()
                     loop.add_reader(fd, _is_ready, fut)
                     try:
                         await fut
                     finally:
                         loop.remove_reader(fd)
-                if isinstance(exc, BLOCKING_IO_WRITE_ERROR):
+                if isinstance(exc, (BLOCKING_IO_WRITE_ERROR, PYBLOCKING_IO_WRITE_ERROR)):
                     fut = loop.create_future()
                     loop.add_writer(fd, _is_ready, fut)
                     try:
                         await fut
                     finally:
                         loop.remove_writer(fd)
-                if _HAVE_PYOPENSSL and isinstance(exc, BLOCKING_IO_LOOKUP_ERROR):
+                if _HAVE_PYOPENSSL and isinstance(
+                    exc, (BLOCKING_IO_LOOKUP_ERROR, PYBLOCKING_IO_LOOKUP_ERROR)
+                ):
                     fut = loop.create_future()
                     loop.add_reader(fd, _is_ready, fut)
                     try:
@@ -192,7 +201,7 @@ def _is_ready(fut: Future) -> None:
     # https://docs.python.org/3/library/asyncio-platforms.html#asyncio-platform-support
     # Note: In PYTHON-4493 we plan to replace this code with asyncio streams.
     async def _async_socket_sendall_ssl(
-        sock: Union[socket.socket, _sslConn], buf: bytes, dummy: AbstractEventLoop
+        sock: Union[socket.socket, _pysslConn], buf: bytes, dummy: AbstractEventLoop
     ) -> None:
         view = memoryview(buf)
         total_length = len(buf)
@@ -213,7 +222,7 @@ async def _async_socket_sendall_ssl(
             total_sent += sent
 
     async def _async_socket_receive_ssl(
-        conn: _sslConn, length: int, dummy: AbstractEventLoop, once: Optional[bool] = False
+        conn: _pysslConn, length: int, dummy: AbstractEventLoop, once: Optional[bool] = False
     ) -> memoryview:
         mv = memoryview(bytearray(length))
         total_read = 0
@@ -239,7 +248,7 @@ async def _async_socket_receive_ssl(
         return mv
 
 
-def sendall(sock: Union[socket.socket, _sslConn], buf: bytes) -> None:
+def sendall(sock: Union[socket.socket, _pysslConn], buf: bytes) -> None:
     sock.sendall(buf)
 
 
@@ -252,15 +261,15 @@ async def _poll_cancellation(conn: AsyncConnection) -> None:
 
 
 async def async_receive_data_socket(
-    sock: Union[socket.socket, _sslConn], length: int
+    sock: Union[socket.socket, _pysslConn], length: int
 ) -> memoryview:
     sock_timeout = sock.gettimeout()
     timeout = sock_timeout
 
     sock.settimeout(0.0)
     loop = asyncio.get_running_loop()
     try:
-        if _HAVE_SSL and isinstance(sock, (SSLSocket, _sslConn)):
+        if _HAVE_SSL and isinstance(sock, (SSLSocket, _pysslConn)):
             return await asyncio.wait_for(
                 _async_socket_receive_ssl(sock, length, loop, once=True),  # type: ignore[arg-type]
                 timeout=timeout,
@@ -435,7 +444,7 @@ def sock(self) -> socket.socket:
 
 
 class NetworkingInterface(NetworkingInterfaceBase):
-    def __init__(self, conn: Union[socket.socket, _sslConn]):
+    def __init__(self, conn: Union[socket.socket, _pysslConn]):
         super().__init__(conn)
 
     def gettimeout(self) -> float | None:
@@ -451,11 +460,11 @@ def is_closing(self) -> bool:
         return self.conn.is_closing()
 
     @property
-    def get_conn(self) -> Union[socket.socket, _sslConn]:
+    def get_conn(self) -> Union[socket.socket, _pysslConn]:
         return self.conn
 
     @property
-    def sock(self) -> Union[socket.socket, _sslConn]:
+    def sock(self) -> Union[socket.socket, _pysslConn]:
         return self.conn
 
     def fileno(self) -> int: