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

Author: blink1073

CONTRIBUTING.md

@@ -244,3 +244,7 @@ The `-b` flag adds as a regex pattern to block files you do not wish to
 update in PyMongo. This is primarily helpful if you are implementing a
 new feature in PyMongo that has spec tests already implemented, or if
 you are attempting to validate new spec tests in PyMongo.
+
+## Making a Release
+
+Follow the [Python Driver Release Process Wiki](https://wiki.corp.mongodb.com/display/DRIVERS/Python+Driver+Release+Process).

RELEASE.md

@@ -39,6 +39,9 @@ def __init__(self, offset: Union[float, timedelta], name: str) -> None:
     def __getinitargs__(self) -> Tuple[timedelta, str]:
         return self.__offset, self.__name
 
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({self.__offset!r}, {self.__name!r})"
+
     def utcoffset(self, dt: Optional[datetime]) -> timedelta:
         return self.__offset
 

bson/tz_util.py

@@ -30,6 +30,7 @@ PyMongo 4.9 brings a number of improvements including:
   :class:`~pymongo.operations.DeleteOne`, and
   :class:`~pymongo.operations.DeleteMany` operations, so
   they can be used in the new :meth:`~pymongo.mongo_client.MongoClient.bulk_write`.
+- Added :func:`repr` support to :class:`bson.tz_util.FixedOffset`.
 
 Issues Resolved
 ...............

doc/changelog.rst

@@ -40,11 +40,7 @@
 from pymongo.errors import AutoReconnect, ConfigurationError, OperationFailure
 from pymongo.hello import HelloCompat
 from pymongo.operations import InsertOne
-from pymongo.synchronous.auth_oidc import (
-    OIDCCallback,
-    OIDCCallbackContext,
-    OIDCCallbackResult,
-)
+from pymongo.synchronous.auth_oidc import OIDCCallback, OIDCCallbackContext, OIDCCallbackResult
 from pymongo.uri_parser import parse_uri
 
 ROOT = Path(__file__).parent.parent.resolve()
@@ -1019,6 +1015,51 @@ def fetch(self, _):
         # Close the client.
         client.close()
 
+    def test_4_4_speculative_authentication_should_be_ignored_on_reauthentication(self):
+        # Create an OIDC configured client that can listen for `SaslStart` commands.
+        listener = EventListener()
+        client = self.create_client(event_listeners=[listener])
+
+        # Preload the *Client Cache* with a valid access token to enforce Speculative Authentication.
+        client2 = self.create_client()
+        client2.test.test.find_one()
+        client.options.pool_options._credentials.cache.data = (
+            client2.options.pool_options._credentials.cache.data
+        )
+        client2.close()
+        self.request_called = 0
+
+        # Perform an `insert` operation that succeeds.
+        client.test.test.insert_one({})
+
+        # Assert that the callback was not called.
+        self.assertEqual(self.request_called, 0)
+
+        # Assert there were no `SaslStart` commands executed.
+        assert not any(
+            event.command_name.lower() == "saslstart" for event in listener.started_events
+        )
+        listener.reset()
+
+        # Set a fail point for `insert` commands of the form:
+        with self.fail_point(
+            {
+                "mode": {"times": 1},
+                "data": {"failCommands": ["insert"], "errorCode": 391},
+            }
+        ):
+            # Perform an `insert` operation that succeeds.
+            client.test.test.insert_one({})
+
+        # Assert that the callback was called once.
+        self.assertEqual(self.request_called, 1)
+
+        # Assert there were `SaslStart` commands executed.
+        assert any(event.command_name.lower() == "saslstart" for event in listener.started_events)
+
+        # Close the client.
+        client.close()
+
     def test_5_1_azure_with_no_username(self):
         if ENVIRON != "azure":
             raise unittest.SkipTest("Test is only supported on Azure")

test/auth_oidc/test_auth_oidc.py

@@ -1019,6 +1019,10 @@ def test_tzinfo(self):
         tz = FixedOffset(42, "forty-two")
         self.assertRaises(ValueError, CodecOptions, tzinfo=tz)
         self.assertEqual(tz, CodecOptions(tz_aware=True, tzinfo=tz).tzinfo)
+        self.assertEqual(repr(tz), "FixedOffset(datetime.timedelta(seconds=2520), 'forty-two')")
+        self.assertEqual(
+            repr(eval(repr(tz))), "FixedOffset(datetime.timedelta(seconds=2520), 'forty-two')"
+        )
 
     def test_codec_options_repr(self):
         r = (