PYTHON-5341 Fix handling of simple clients

Author: blink1073

test/__init__.py

@@ -1138,6 +1138,10 @@ def rs_or_single_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> Mo
         return self._async_mongo_client(h, p, **kwargs)
 
     def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> MongoClient:
+        client_options: dict = client_context.default_client_options.copy()
+        kwargs = kwargs.copy()
+        for key, value in client_options:
+            kwargs.setdefault(key, value)
         if not h and not p:
             client = MongoClient(**kwargs)
         else:
@@ -1147,6 +1151,10 @@ def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> MongoCli
 
     @classmethod
     def unmanaged_simple_client(cls, h: Any = None, p: Any = None, **kwargs: Any) -> MongoClient:
+        client_options: dict = client_context.default_client_options.copy()
+        kwargs = kwargs.copy()
+        for key, value in client_options:
+            kwargs.setdefault(key, value)
         if not h and not p:
             client = MongoClient(**kwargs)
         else:

test/asynchronous/__init__.py

@@ -1154,6 +1154,10 @@ async def async_rs_or_single_client(
         return await self._async_mongo_client(h, p, **kwargs)
 
     def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> AsyncMongoClient:
+        client_options: dict = async_client_context.default_client_options.copy()
+        kwargs = kwargs.copy()
+        for key, value in client_options:
+            kwargs.setdefault(key, value)
         if not h and not p:
             client = AsyncMongoClient(**kwargs)
         else:
@@ -1165,6 +1169,10 @@ def simple_client(self, h: Any = None, p: Any = None, **kwargs: Any) -> AsyncMon
     def unmanaged_simple_client(
         cls, h: Any = None, p: Any = None, **kwargs: Any
     ) -> AsyncMongoClient:
+        client_options: dict = async_client_context.default_client_options.copy()
+        kwargs = kwargs.copy()
+        for key, value in client_options:
+            kwargs.setdefault(key, value)
         if not h and not p:
             client = AsyncMongoClient(**kwargs)
         else: