run pre-commit

Author: sleepyStick

gridfs/synchronous/grid_file.py

@@ -100,7 +100,7 @@ def __init__(self, database: Database, collection: str = "fs"):
         .. seealso:: The MongoDB documentation on `gridfs <https://dochub.mongodb.org/core/gridfs>`_.
         """
         if not isinstance(database, Database):
-            raise TypeError("database must be an instance of Database")
+            raise TypeError(f"database must be an instance of Database, not {type(database)}.")
 
         database = _clear_entity_type_registry(database)
 
@@ -501,7 +501,7 @@ def __init__(
         .. seealso:: The MongoDB documentation on `gridfs <https://dochub.mongodb.org/core/gridfs>`_.
         """
         if not isinstance(db, Database):
-            raise TypeError("database must be an instance of Database")
+            raise TypeError(f"database must be an instance of Database, not {type(db)}.")
 
         db = _clear_entity_type_registry(db)
 
@@ -1076,7 +1076,9 @@ def __init__(
            :attr:`~pymongo.collection.Collection.write_concern`
         """
         if not isinstance(root_collection, Collection):
-            raise TypeError("root_collection must be an instance of Collection")
+            raise TypeError(
+                f"root_collection must be an instance of Collection, not {type(root_collection)}."
+            )
 
         if not root_collection.write_concern.acknowledged:
             raise ConfigurationError("root_collection must use acknowledged write_concern")
@@ -1426,7 +1428,9 @@ def __init__(
            from the server. Metadata is fetched when first needed.
         """
         if not isinstance(root_collection, Collection):
-            raise TypeError("root_collection must be an instance of Collection")
+            raise TypeError(
+                f"root_collection must be an instance of Collection, not {type(root_collection)}."
+            )
         _disallow_transactions(session)
 
         root_collection = _clear_entity_type_registry(root_collection)

pymongo/synchronous/auth.py

@@ -158,7 +158,7 @@ def _password_digest(username: str, password: str) -> str:
     if len(password) == 0:
         raise ValueError("password can't be empty")
     if not isinstance(username, str):
-        raise TypeError("username must be an instance of str")
+        raise TypeError(f"username must be an instance of str, not {type(username)}.")
 
     md5hash = hashlib.md5()  # noqa: S324
     data = f"{username}:mongo:{password}"

pymongo/synchronous/auth_oidc.py

@@ -213,7 +213,9 @@ def _get_access_token(self) -> Optional[str]:
                 )
                 resp = cb.fetch(context)
                 if not isinstance(resp, OIDCCallbackResult):
-                    raise ValueError("Callback result must be of type OIDCCallbackResult")
+                    raise ValueError(
+                        f"Callback result must be of type OIDCCallbackResult, not {type(resp)}."
+                    )
                 self.refresh_token = resp.refresh_token
                 self.access_token = resp.access_token
                 self.token_gen_id += 1

pymongo/synchronous/client_session.py

@@ -309,7 +309,9 @@ def __init__(
                 )
         if max_commit_time_ms is not None:
             if not isinstance(max_commit_time_ms, int):
-                raise TypeError("max_commit_time_ms must be an integer or None")
+                raise TypeError(
+                    f"max_commit_time_ms must be an integer or None, not {type(max_commit_time_ms)}."
+                )
 
     @property
     def read_concern(self) -> Optional[ReadConcern]:
@@ -897,7 +899,9 @@ def advance_cluster_time(self, cluster_time: Mapping[str, Any]) -> None:
             another `ClientSession` instance.
         """
         if not isinstance(cluster_time, _Mapping):
-            raise TypeError("cluster_time must be a subclass of collections.Mapping")
+            raise TypeError(
+                f"cluster_time must be a subclass of collections.Mapping, not {type(cluster_time)}."
+            )
         if not isinstance(cluster_time.get("clusterTime"), Timestamp):
             raise ValueError("Invalid cluster_time")
         self._advance_cluster_time(cluster_time)
@@ -918,7 +922,9 @@ def advance_operation_time(self, operation_time: Timestamp) -> None:
             another `ClientSession` instance.
         """
         if not isinstance(operation_time, Timestamp):
-            raise TypeError("operation_time must be an instance of bson.timestamp.Timestamp")
+            raise TypeError(
+                f"operation_time must be an instance of bson.timestamp.Timestamp, not {type(operation_time)}."
+            )
         self._advance_operation_time(operation_time)
 
     def _process_response(self, reply: Mapping[str, Any]) -> None:

pymongo/synchronous/collection.py

@@ -231,7 +231,7 @@ def __init__(
             read_concern or database.read_concern,
         )
         if not isinstance(name, str):
-            raise TypeError("name must be an instance of str")
+            raise TypeError(f"name must be an instance of str, not {type(name)}.")
         from pymongo.synchronous.database import Database
 
         if not isinstance(database, Database):
@@ -2472,7 +2472,7 @@ def _drop_index(
             name = helpers_shared._gen_index_name(index_or_name)
 
         if not isinstance(name, str):
-            raise TypeError("index_or_name must be an instance of str or list")
+            raise TypeError(f"index_or_name must be an instance of str or list, not {type(name)}.")
 
         cmd = {"dropIndexes": self._name, "index": name}
         cmd.update(kwargs)
@@ -3071,7 +3071,7 @@ def rename(
 
         """
         if not isinstance(new_name, str):
-            raise TypeError("new_name must be an instance of str")
+            raise TypeError(f"new_name must be an instance of str, not {type(new_name)}.")
 
         if not new_name or ".." in new_name:
             raise InvalidName("collection names cannot be empty")
@@ -3141,7 +3141,7 @@ def distinct(
 
         """
         if not isinstance(key, str):
-            raise TypeError("key must be an instance of str")
+            raise TypeError(f"key must be an instance of str, not {type(key)}.")
         cmd = {"distinct": self._name, "key": key}
         if filter is not None:
             if "query" in kwargs:
@@ -3189,7 +3189,7 @@ def _find_and_modify(
         common.validate_is_mapping("filter", filter)
         if not isinstance(return_document, bool):
             raise ValueError(
-                "return_document must be ReturnDocument.BEFORE or ReturnDocument.AFTER"
+                f"return_document must be ReturnDocument.BEFORE or ReturnDocument.AFTER, not {type(return_document)}."
             )
         collation = validate_collation_or_none(kwargs.pop("collation", None))
         cmd = {"findAndModify": self._name, "query": filter, "new": return_document}

pymongo/synchronous/command_cursor.py

@@ -94,7 +94,9 @@ def __init__(
         self.batch_size(batch_size)
 
         if not isinstance(max_await_time_ms, int) and max_await_time_ms is not None:
-            raise TypeError("max_await_time_ms must be an integer or None")
+            raise TypeError(
+                f"max_await_time_ms must be an integer or None, not {type(max_await_time_ms)}."
+            )
 
     def __del__(self) -> None:
         self._die_no_lock()
@@ -115,7 +117,7 @@ def batch_size(self, batch_size: int) -> CommandCursor[_DocumentType]:
         :param batch_size: The size of each batch of results requested.
         """
         if not isinstance(batch_size, int):
-            raise TypeError("batch_size must be an integer")
+            raise TypeError(f"batch_size must be an integer, not {type(batch_size)}.")
         if batch_size < 0:
             raise ValueError("batch_size must be >= 0")
 

pymongo/synchronous/cursor.py

@@ -146,9 +146,9 @@ def __init__(
         spec: Mapping[str, Any] = filter or {}
         validate_is_mapping("filter", spec)
         if not isinstance(skip, int):
-            raise TypeError("skip must be an instance of int")
+            raise TypeError(f"skip must be an instance of int, not {type(skip)}.")
         if not isinstance(limit, int):
-            raise TypeError("limit must be an instance of int")
+            raise TypeError(f"limit must be an instance of int, not {type(limit)}.")
         validate_boolean("no_cursor_timeout", no_cursor_timeout)
         if no_cursor_timeout and not self._explicit_session:
             warnings.warn(
@@ -171,7 +171,7 @@ def __init__(
         validate_boolean("allow_partial_results", allow_partial_results)
         validate_boolean("oplog_replay", oplog_replay)
         if not isinstance(batch_size, int):
-            raise TypeError("batch_size must be an integer")
+            raise TypeError(f"batch_size must be an integer, not {type(batch_size)}.")
         if batch_size < 0:
             raise ValueError("batch_size must be >= 0")
         # Only set if allow_disk_use is provided by the user, else None.
@@ -388,7 +388,7 @@ def add_option(self, mask: int) -> Cursor[_DocumentType]:
         cursor.add_option(2)
         """
         if not isinstance(mask, int):
-            raise TypeError("mask must be an int")
+            raise TypeError(f"mask must be an int, not {type(mask)}.")
         self._check_okay_to_chain()
 
         if mask & _QUERY_OPTIONS["exhaust"]:
@@ -408,7 +408,7 @@ def remove_option(self, mask: int) -> Cursor[_DocumentType]:
         cursor.remove_option(2)
         """
         if not isinstance(mask, int):
-            raise TypeError("mask must be an int")
+            raise TypeError(f"mask must be an int, not {type(mask)}.")
         self._check_okay_to_chain()
 
         if mask & _QUERY_OPTIONS["exhaust"]:
@@ -432,7 +432,7 @@ def allow_disk_use(self, allow_disk_use: bool) -> Cursor[_DocumentType]:
         .. versionadded:: 3.11
         """
         if not isinstance(allow_disk_use, bool):
-            raise TypeError("allow_disk_use must be a bool")
+            raise TypeError(f"allow_disk_use must be a bool, not {type(allow_disk_use)}.")
         self._check_okay_to_chain()
 
         self._allow_disk_use = allow_disk_use
@@ -451,7 +451,7 @@ def limit(self, limit: int) -> Cursor[_DocumentType]:
         .. seealso:: The MongoDB documentation on `limit <https://dochub.mongodb.org/core/limit>`_.
         """
         if not isinstance(limit, int):
-            raise TypeError("limit must be an integer")
+            raise TypeError(f"limit must be an integer, not {type(limit)}.")
         if self._exhaust:
             raise InvalidOperation("Can't use limit and exhaust together.")
         self._check_okay_to_chain()
@@ -479,7 +479,7 @@ def batch_size(self, batch_size: int) -> Cursor[_DocumentType]:
         :param batch_size: The size of each batch of results requested.
         """
         if not isinstance(batch_size, int):
-            raise TypeError("batch_size must be an integer")
+            raise TypeError(f"batch_size must be an integer, not {type(batch_size)}.")
         if batch_size < 0:
             raise ValueError("batch_size must be >= 0")
         self._check_okay_to_chain()
@@ -499,7 +499,7 @@ def skip(self, skip: int) -> Cursor[_DocumentType]:
         :param skip: the number of results to skip
         """
         if not isinstance(skip, int):
-            raise TypeError("skip must be an integer")
+            raise TypeError(f"skip must be an integer, not {type(skip)}.")
         if skip < 0:
             raise ValueError("skip must be >= 0")
         self._check_okay_to_chain()
@@ -520,7 +520,7 @@ def max_time_ms(self, max_time_ms: Optional[int]) -> Cursor[_DocumentType]:
         :param max_time_ms: the time limit after which the operation is aborted
         """
         if not isinstance(max_time_ms, int) and max_time_ms is not None:
-            raise TypeError("max_time_ms must be an integer or None")
+            raise TypeError(f"max_time_ms must be an integer or None, not {type(max_time_ms)}.")
         self._check_okay_to_chain()
 
         self._max_time_ms = max_time_ms
@@ -543,7 +543,9 @@ def max_await_time_ms(self, max_await_time_ms: Optional[int]) -> Cursor[_Documen
         .. versionadded:: 3.2
         """
         if not isinstance(max_await_time_ms, int) and max_await_time_ms is not None:
-            raise TypeError("max_await_time_ms must be an integer or None")
+            raise TypeError(
+                f"max_await_time_ms must be an integer or None, not {type(max_await_time_ms)}."
+            )
         self._check_okay_to_chain()
 
         # Ignore max_await_time_ms if not tailable or await_data is False.
@@ -677,7 +679,7 @@ def max(self, spec: _Sort) -> Cursor[_DocumentType]:
         .. versionadded:: 2.7
         """
         if not isinstance(spec, (list, tuple)):
-            raise TypeError("spec must be an instance of list or tuple")
+            raise TypeError(f"spec must be an instance of list or tuple, not {type(spec)}.")
 
         self._check_okay_to_chain()
         self._max = dict(spec)
@@ -699,7 +701,7 @@ def min(self, spec: _Sort) -> Cursor[_DocumentType]:
         .. versionadded:: 2.7
         """
         if not isinstance(spec, (list, tuple)):
-            raise TypeError("spec must be an instance of list or tuple")
+            raise TypeError(f"spec must be an instance of list or tuple, not {type(spec)}.")
 
         self._check_okay_to_chain()
         self._min = dict(spec)

pymongo/synchronous/database.py

@@ -122,7 +122,7 @@ def __init__(
         from pymongo.synchronous.mongo_client import MongoClient
 
         if not isinstance(name, str):
-            raise TypeError("name must be an instance of str")
+            raise TypeError(f"name must be an instance of str, not {type(name)}.")
 
         if not isinstance(client, MongoClient):
             # This is for compatibility with mocked and subclassed types, such as in Motor.
@@ -1303,7 +1303,7 @@ def drop_collection(
             name = name.name
 
         if not isinstance(name, str):
-            raise TypeError("name_or_collection must be an instance of str")
+            raise TypeError(f"name_or_collection must be an instance of str, not {type(name)}.")
         encrypted_fields = self._get_encrypted_fields(
             {"encryptedFields": encrypted_fields},
             name,
@@ -1367,7 +1367,9 @@ def validate_collection(
             name = name.name
 
         if not isinstance(name, str):
-            raise TypeError("name_or_collection must be an instance of str or Collection")
+            raise TypeError(
+                f"name_or_collection must be an instance of str or Collection, not {type(name)}."
+            )
         cmd = {"validate": name, "scandata": scandata, "full": full}
         if comment is not None:
             cmd["comment"] = comment

pymongo/synchronous/encryption.py

@@ -320,7 +320,9 @@ def insert_data_key(self, data_key: bytes) -> Binary:
         raw_doc = RawBSONDocument(data_key, _KEY_VAULT_OPTS)
         data_key_id = raw_doc.get("_id")
         if not isinstance(data_key_id, Binary) or data_key_id.subtype != UUID_SUBTYPE:
-            raise TypeError("data_key _id must be Binary with a UUID subtype")
+            raise TypeError(
+                f"data_key _id must be Binary with a UUID subtype, not {type(data_key_id)}."
+            )
 
         assert self.key_vault_coll is not None
         self.key_vault_coll.insert_one(raw_doc)
@@ -642,7 +644,9 @@ def __init__(
             )
 
         if not isinstance(codec_options, CodecOptions):
-            raise TypeError("codec_options must be an instance of bson.codec_options.CodecOptions")
+            raise TypeError(
+                f"codec_options must be an instance of bson.codec_options.CodecOptions, not {type(codec_options)}."
+            )
 
         if not isinstance(key_vault_client, MongoClient):
             # This is for compatibility with mocked and subclassed types, such as in Motor.

pymongo/synchronous/mongo_client.py

@@ -748,7 +748,7 @@ def __init__(
         if port is None:
             port = self.PORT
         if not isinstance(port, int):
-            raise TypeError("port must be an instance of int")
+            raise TypeError(f"port must be an instance of int, not {type(port)}.")
 
         # _pool_class, _monitor_class, and _condition_class are for deep
         # customization of PyMongo, e.g. Motor.
@@ -1965,7 +1965,7 @@ def _close_cursor_now(
         The cursor is closed synchronously on the current thread.
         """
         if not isinstance(cursor_id, int):
-            raise TypeError("cursor_id must be an instance of int")
+            raise TypeError(f"cursor_id must be an instance of int, not {type(cursor_id)}.")
 
         try:
             if conn_mgr:
@@ -2087,7 +2087,9 @@ def _tmp_session(
         """If provided session is None, lend a temporary session."""
         if session is not None:
             if not isinstance(session, client_session.ClientSession):
-                raise ValueError("'session' argument must be a ClientSession or None.")
+                raise ValueError(
+                    f"'session' argument must be a ClientSession or None, not {type(session)}."
+                )
             # Don't call end_session.
             yield session
             return
@@ -2235,7 +2237,9 @@ def drop_database(
             name = name.name
 
         if not isinstance(name, str):
-            raise TypeError("name_or_database must be an instance of str or a Database")
+            raise TypeError(
+                f"name_or_database must be an instance of str or a Database, not {type(name)}."
+            )
 
         with self._conn_for_writes(session, operation=_Op.DROP_DATABASE) as conn:
             self[name]._command(