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

Author: blink1073

bson/_cbsonmodule.c

@@ -3227,11 +3227,18 @@ _cbson_exec(PyObject *m)
         INITERROR;
     }
 
+#if PY_VERSION_HEX >= 0x030D0000
+    if (PyModule_Add(m, "_C_API", c_api_object) < 0) {
+        Py_DECREF(m);
+        INITERROR;
+    }
+# else
     if (PyModule_AddObject(m, "_C_API", c_api_object) < 0) {
         Py_DECREF(c_api_object);
         Py_DECREF(m);
         INITERROR;
     }
+#endif
 
     return 0;
 }

pymongo/asynchronous/topology.py

@@ -154,8 +154,8 @@ def __init__(self, topology_settings: TopologySettings):
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=initial_td,
-                newDescription=self._description,
+                previousDescription=repr(initial_td),
+                newDescription=repr(self._description),
             )
 
         for seed in topology_settings.seeds:
@@ -514,8 +514,8 @@ async def _process_change(
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=td_old,
-                newDescription=self._description,
+                previousDescription=repr(td_old),
+                newDescription=repr(self._description),
             )
 
         # Shutdown SRV polling for unsupported cluster types.
@@ -581,8 +581,8 @@ async def _process_srv_update(self, seedlist: list[tuple[str, Any]]) -> None:
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=td_old,
-                newDescription=self._description,
+                previousDescription=repr(td_old),
+                newDescription=repr(self._description),
             )
 
     async def on_srv_update(self, seedlist: list[tuple[str, Any]]) -> None:
@@ -747,8 +747,8 @@ async def close(self) -> None:
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=old_td,
-                newDescription=self._description,
+                previousDescription=repr(old_td),
+                newDescription=repr(self._description),
             )
             _debug_log(
                 _SDAM_LOGGER, message=_SDAMStatusMessage.STOP_TOPOLOGY, topologyId=self._topology_id

pymongo/synchronous/topology.py

@@ -154,8 +154,8 @@ def __init__(self, topology_settings: TopologySettings):
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=initial_td,
-                newDescription=self._description,
+                previousDescription=repr(initial_td),
+                newDescription=repr(self._description),
             )
 
         for seed in topology_settings.seeds:
@@ -514,8 +514,8 @@ def _process_change(
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=td_old,
-                newDescription=self._description,
+                previousDescription=repr(td_old),
+                newDescription=repr(self._description),
             )
 
         # Shutdown SRV polling for unsupported cluster types.
@@ -581,8 +581,8 @@ def _process_srv_update(self, seedlist: list[tuple[str, Any]]) -> None:
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=td_old,
-                newDescription=self._description,
+                previousDescription=repr(td_old),
+                newDescription=repr(self._description),
             )
 
     def on_srv_update(self, seedlist: list[tuple[str, Any]]) -> None:
@@ -745,8 +745,8 @@ def close(self) -> None:
                 _SDAM_LOGGER,
                 message=_SDAMStatusMessage.TOPOLOGY_CHANGE,
                 topologyId=self._topology_id,
-                previousDescription=old_td,
-                newDescription=self._description,
+                previousDescription=repr(old_td),
+                newDescription=repr(self._description),
             )
             _debug_log(
                 _SDAM_LOGGER, message=_SDAMStatusMessage.STOP_TOPOLOGY, topologyId=self._topology_id

test/asynchronous/test_srv_polling.py

@@ -20,7 +20,6 @@
 import time
 from test.utils_shared import FunctionCallRecorder
 from typing import Any
-from unittest import skipIf
 
 sys.path[0:0] = [""]
 
@@ -92,7 +91,6 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.disable()
 
 
-@skipIf(not _IS_SYNC and sys.platform == "win32", "PYTHON-5342 known issue on Windows")
 class TestSrvPolling(AsyncPyMongoTestCase):
     BASE_SRV_RESPONSE = [
         ("localhost.test.build.10gen.cc", 27017),
@@ -186,6 +184,9 @@ def dns_resolver_response():
             ):
                 await assertion_method(expected_response, client)
 
+            # Close the client early to avoid affecting the next scenario run.
+            await client.close()
+
     async def test_addition(self):
         response = self.BASE_SRV_RESPONSE[:]
         response.append(("localhost.test.build.10gen.cc", 27019))

test/asynchronous/unified_format.py

@@ -303,6 +303,7 @@ async def _create_entity(self, entity_spec, uri=None):
             if uri:
                 kwargs["h"] = uri
             client = await self.test.async_rs_or_single_client(**kwargs)
+            await client.aconnect()
             self[spec["id"]] = client
             return
         elif entity_type == "database":

test/test_srv_polling.py

@@ -20,7 +20,6 @@
 import time
 from test.utils_shared import FunctionCallRecorder
 from typing import Any
-from unittest import skipIf
 
 sys.path[0:0] = [""]
 
@@ -92,7 +91,6 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.disable()
 
 
-@skipIf(not _IS_SYNC and sys.platform == "win32", "PYTHON-5342 known issue on Windows")
 class TestSrvPolling(PyMongoTestCase):
     BASE_SRV_RESPONSE = [
         ("localhost.test.build.10gen.cc", 27017),
@@ -186,6 +184,9 @@ def dns_resolver_response():
             ):
                 assertion_method(expected_response, client)
 
+            # Close the client early to avoid affecting the next scenario run.
+            client.close()
+
     def test_addition(self):
         response = self.BASE_SRV_RESPONSE[:]
         response.append(("localhost.test.build.10gen.cc", 27019))

test/unified_format.py

@@ -302,6 +302,7 @@ def _create_entity(self, entity_spec, uri=None):
             if uri:
                 kwargs["h"] = uri
             client = self.test.rs_or_single_client(**kwargs)
+            client._connect()
             self[spec["id"]] = client
             return
         elif entity_type == "database":