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

Author: blink1073

pymongo/asynchronous/collection.py

@@ -231,7 +231,9 @@ def __init__(
         from pymongo.asynchronous.database import AsyncDatabase
 
         if not isinstance(database, AsyncDatabase):
-            raise TypeError(f"AsyncCollection requires an AsyncDatabase but {type(database)} given")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "AsyncDatabase" for cls in type(database).__mro__):
+                raise TypeError(f"AsyncDatabase required but given {type(database).__name__}")
 
         if not name or ".." in name:
             raise InvalidName("collection names cannot be empty")

pymongo/asynchronous/database.py

@@ -125,7 +125,9 @@ def __init__(
             raise TypeError("name must be an instance of str")
 
         if not isinstance(client, AsyncMongoClient):
-            raise TypeError(f"AsyncMongoClient required but given {type(client)}")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "AsyncMongoClient" for cls in type(client).__mro__):
+                raise TypeError(f"AsyncMongoClient required but given {type(client).__name__}")
 
         if name != "$external":
             _check_name(name)

pymongo/asynchronous/encryption.py

@@ -597,7 +597,13 @@ def __init__(
             raise TypeError("codec_options must be an instance of bson.codec_options.CodecOptions")
 
         if not isinstance(key_vault_client, AsyncMongoClient):
-            raise TypeError(f"AsyncMongoClient required but given {type(key_vault_client)}")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(
+                cls.__name__ == "AsyncMongoClient" for cls in type(key_vault_client).__mro__
+            ):
+                raise TypeError(
+                    f"AsyncMongoClient required but given {type(key_vault_client).__name__}"
+                )
 
         self._kms_providers = kms_providers
         self._key_vault_namespace = key_vault_namespace
@@ -685,9 +691,9 @@ async def create_encrypted_collection(
 
         """
         if not isinstance(database, AsyncDatabase):
-            raise TypeError(
-                f"create_encrypted_collection() requires an AsyncDatabase but {type(database)} given"
-            )
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "AsyncDatabase" for cls in type(database).__mro__):
+                raise TypeError(f"AsyncDatabase required but given {type(database).__name__}")
 
         encrypted_fields = deepcopy(encrypted_fields)
         for i, field in enumerate(encrypted_fields["fields"]):

pymongo/asynchronous/mongo_client.py

@@ -2446,7 +2446,9 @@ def __init__(
         self, client: AsyncMongoClient, server: Server, session: Optional[AsyncClientSession]
     ):
         if not isinstance(client, AsyncMongoClient):
-            raise TypeError(f"AsyncMongoClient required but given {type(client)}")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "AsyncMongoClient" for cls in type(client).__mro__):
+                raise TypeError(f"AsyncMongoClient required but given {type(client).__name__}")
 
         self.client = client
         self.server_address = server.description.address

pymongo/synchronous/collection.py

@@ -234,7 +234,9 @@ def __init__(
         from pymongo.synchronous.database import Database
 
         if not isinstance(database, Database):
-            raise TypeError(f"Collection requires a Database but {type(database)} given")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "Database" for cls in type(database).__mro__):
+                raise TypeError(f"Database required but given {type(database).__name__}")
 
         if not name or ".." in name:
             raise InvalidName("collection names cannot be empty")

pymongo/synchronous/database.py

@@ -125,7 +125,9 @@ def __init__(
             raise TypeError("name must be an instance of str")
 
         if not isinstance(client, MongoClient):
-            raise TypeError(f"MongoClient required but given {type(client)}")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "MongoClient" for cls in type(client).__mro__):
+                raise TypeError(f"MongoClient required but given {type(client).__name__}")
 
         if name != "$external":
             _check_name(name)

pymongo/synchronous/encryption.py

@@ -595,7 +595,9 @@ def __init__(
             raise TypeError("codec_options must be an instance of bson.codec_options.CodecOptions")
 
         if not isinstance(key_vault_client, MongoClient):
-            raise TypeError(f"MongoClient required but given {type(key_vault_client)}")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "MongoClient" for cls in type(key_vault_client).__mro__):
+                raise TypeError(f"MongoClient required but given {type(key_vault_client).__name__}")
 
         self._kms_providers = kms_providers
         self._key_vault_namespace = key_vault_namespace
@@ -683,9 +685,9 @@ def create_encrypted_collection(
 
         """
         if not isinstance(database, Database):
-            raise TypeError(
-                f"create_encrypted_collection() requires a Database but {type(database)} given"
-            )
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "Database" for cls in type(database).__mro__):
+                raise TypeError(f"Database required but given {type(database).__name__}")
 
         encrypted_fields = deepcopy(encrypted_fields)
         for i, field in enumerate(encrypted_fields["fields"]):

pymongo/synchronous/mongo_client.py

@@ -2434,7 +2434,9 @@ class _MongoClientErrorHandler:
 
     def __init__(self, client: MongoClient, server: Server, session: Optional[ClientSession]):
         if not isinstance(client, MongoClient):
-            raise TypeError(f"MongoClient required but given {type(client)}")
+            # This is for compatibility with mocked and subclassed types, such as in Motor.
+            if not any(cls.__name__ == "MongoClient" for cls in type(client).__mro__):
+                raise TypeError(f"MongoClient required but given {type(client).__name__}")
 
         self.client = client
         self.server_address = server.description.address

test/unified_format.py

@@ -580,7 +580,7 @@ def _create_entity(self, entity_spec, uri=None):
             return
         elif entity_type == "database":
             client = self[spec["client"]]
-            if not isinstance(client, MongoClient):
+            if type(client).__name__ != "MongoClient":
                 self.test.fail(
                     "Expected entity {} to be of type MongoClient, got {}".format(
                         spec["client"], type(client)
@@ -602,7 +602,7 @@ def _create_entity(self, entity_spec, uri=None):
             return
         elif entity_type == "session":
             client = self[spec["client"]]
-            if not isinstance(client, MongoClient):
+            if type(client).__name__ != "MongoClient":
                 self.test.fail(
                     "Expected entity {} to be of type MongoClient, got {}".format(
                         spec["client"], type(client)
@@ -667,7 +667,7 @@ def create_entities_from_spec(self, entity_spec, uri=None):
 
     def get_listener_for_client(self, client_name: str) -> EventListenerUtil:
         client = self[client_name]
-        if not isinstance(client, MongoClient):
+        if type(client).__name__ != "MongoClient":
             self.test.fail(
                 f"Expected entity {client_name} to be of type MongoClient, got {type(client)}"
             )