Merge branch 'master' of github.com:mongodb/mongo-python-driver

Author: blink1073

doc/changelog.rst

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Changes in Version 4.15.1 (XXXX/XX/XX)
+--------------------------------------
+
+Version 4.15.1 is a bug fix release.
+
+- Fixed a bug in ``AsyncMongoClient`` that caused a
+  ``ServerSelectionTimeoutError`` when used with ``uvicorn``, ``FastAPI``, or ``uvloop``.
+
 Changes in Version 4.15.0 (2025/09/10)
 --------------------------------------
 

pymongo/asynchronous/encryption.py

@@ -935,7 +935,8 @@ async def _encrypt_helper(
                 contention_factor=contention_factor,
                 range_opts=range_opts_bytes,
                 is_expression=is_expression,
-                text_opts=text_opts_bytes,
+                # For compatibility with pymongocrypt < 1.16:
+                **{"text_opts": text_opts_bytes} if text_opts_bytes else {},
             )
             return decode(encrypted_doc)["v"]
 

pymongo/network_layer.py

@@ -22,7 +22,7 @@
 import struct
 import sys
 import time
-from asyncio import BaseTransport, BufferedProtocol, Future, Protocol, Transport
+from asyncio import BaseProtocol, BaseTransport, BufferedProtocol, Future, Transport
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -250,7 +250,7 @@ def recv_into(self, buffer: bytes | memoryview) -> int:
         return self.conn.recv_into(buffer)
 
 
-class PyMongoBaseProtocol(Protocol):
+class PyMongoBaseProtocol(BaseProtocol):
     def __init__(self, timeout: Optional[float] = None):
         self.transport: Transport = None  # type: ignore[assignment]
         self._timeout = timeout

pymongo/synchronous/encryption.py

@@ -928,7 +928,8 @@ def _encrypt_helper(
                 contention_factor=contention_factor,
                 range_opts=range_opts_bytes,
                 is_expression=is_expression,
-                text_opts=text_opts_bytes,
+                # For compatibility with pymongocrypt < 1.16:
+                **{"text_opts": text_opts_bytes} if text_opts_bytes else {},
             )
             return decode(encrypted_doc)["v"]