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

Author: blink1073

.evergreen/spec-patch/PYTHON-4884.patch

@@ -92,11 +92,11 @@ def get_token(self, username=None):
                 return fid.read()
         elif ENVIRON == "azure":
             opts = parse_uri(self.uri_single)["options"]
-            token_aud = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+            token_aud = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
             return _get_azure_response(token_aud, username)["access_token"]
         elif ENVIRON == "gcp":
             opts = parse_uri(self.uri_single)["options"]
-            token_aud = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+            token_aud = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
             return _get_gcp_response(token_aud, username)["access_token"]
         elif ENVIRON == "k8s":
             return _get_k8s_token()
@@ -1108,7 +1108,7 @@ async def test_5_1_azure_with_no_username(self):
         if ENVIRON != "azure":
             raise unittest.SkipTest("Test is only supported on Azure")
         opts = parse_uri(self.uri_single)["options"]
-        resource = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+        resource = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
 
         props = dict(TOKEN_RESOURCE=resource, ENVIRONMENT="azure")
         client = await self.create_client(authMechanismProperties=props)
@@ -1119,7 +1119,7 @@ async def test_5_2_azure_with_bad_username(self):
             raise unittest.SkipTest("Test is only supported on Azure")
 
         opts = parse_uri(self.uri_single)["options"]
-        token_aud = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+        token_aud = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
 
         props = dict(TOKEN_RESOURCE=token_aud, ENVIRONMENT="azure")
         client = await self.create_client(username="bad", authmechanismproperties=props)

test/asynchronous/test_auth_oidc.py

@@ -24,6 +24,7 @@
         {
             "description" : "Y10K",
             "canonical_bson" : "1000000009610000DC1FD277E6000000",
+            "relaxed_extjson" : "{\"a\":{\"$date\":{\"$numberLong\":\"253402300800000\"}}}",
             "canonical_extjson" : "{\"a\":{\"$date\":{\"$numberLong\":\"253402300800000\"}}}"
         },
         {

test/bson_corpus/datetime.json

@@ -92,11 +92,11 @@ def get_token(self, username=None):
                 return fid.read()
         elif ENVIRON == "azure":
             opts = parse_uri(self.uri_single)["options"]
-            token_aud = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+            token_aud = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
             return _get_azure_response(token_aud, username)["access_token"]
         elif ENVIRON == "gcp":
             opts = parse_uri(self.uri_single)["options"]
-            token_aud = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+            token_aud = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
             return _get_gcp_response(token_aud, username)["access_token"]
         elif ENVIRON == "k8s":
             return _get_k8s_token()
@@ -1106,7 +1106,7 @@ def test_5_1_azure_with_no_username(self):
         if ENVIRON != "azure":
             raise unittest.SkipTest("Test is only supported on Azure")
         opts = parse_uri(self.uri_single)["options"]
-        resource = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+        resource = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
 
         props = dict(TOKEN_RESOURCE=resource, ENVIRONMENT="azure")
         client = self.create_client(authMechanismProperties=props)
@@ -1117,7 +1117,7 @@ def test_5_2_azure_with_bad_username(self):
             raise unittest.SkipTest("Test is only supported on Azure")
 
         opts = parse_uri(self.uri_single)["options"]
-        token_aud = opts["authmechanismproperties"]["TOKEN_RESOURCE"]
+        token_aud = opts["authMechanismProperties"]["TOKEN_RESOURCE"]
 
         props = dict(TOKEN_RESOURCE=token_aud, ENVIRONMENT="azure")
         client = self.create_client(username="bad", authmechanismproperties=props)