PYTHON-3905 Use from __future__ import annotations in all files (#1370)

* PYTHON-3905 Use from __future__ import annotations in all files

* cleanup

* cleanup

* cleanup

Author: blink1073

.github/workflows/test-python.yml

@@ -84,15 +84,9 @@ jobs:
       - name: Install dependencies
         run: |
           pip install -q tox
-      - name: Run mypy
+      - name: Run typecheck
         run: |
-          tox -m typecheck-mypy
-      - name: Run pyright
-        run: |
-          tox -m typecheck-pyright
-      - name: Run pyright strict
-        run: |
-          tox -m typecheck-pyright-strict
+          tox -m typecheck
 
   docs:
     name: Docs Checks

gridfs/__init__.py

@@ -19,9 +19,10 @@
 
 .. seealso:: The MongoDB documentation on `gridfs <https://dochub.mongodb.org/core/gridfs>`_.
 """
+from __future__ import annotations
 
 from collections import abc
-from typing import Any, List, Mapping, Optional, cast
+from typing import Any, Mapping, Optional, cast
 
 from bson.objectid import ObjectId
 from gridfs.errors import NoFile
@@ -170,7 +171,7 @@ def get_version(
         filename: Optional[str] = None,
         version: Optional[int] = -1,
         session: Optional[ClientSession] = None,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> GridOut:
         """Get a file from GridFS by ``"filename"`` or metadata fields.
 
@@ -275,7 +276,7 @@ def delete(self, file_id: Any, session: Optional[ClientSession] = None) -> None:
         self.__files.delete_one({"_id": file_id}, session=session)
         self.__chunks.delete_many({"files_id": file_id}, session=session)
 
-    def list(self, session: Optional[ClientSession] = None) -> List[str]:
+    def list(self, session: Optional[ClientSession] = None) -> list[str]:
         """List the names of all files stored in this instance of
         :class:`GridFS`.
 
@@ -301,7 +302,7 @@ def find_one(
         filter: Optional[Any] = None,
         session: Optional[ClientSession] = None,
         *args: Any,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> Optional[GridOut]:
         """Get a single file from gridfs.
 
@@ -400,7 +401,7 @@ def exists(
         self,
         document_or_id: Optional[Any] = None,
         session: Optional[ClientSession] = None,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> bool:
         """Check if a file exists in this instance of :class:`GridFS`.
 

gridfs/grid_file.py

@@ -13,11 +13,13 @@
 # limitations under the License.
 
 """Tools for representing files stored in GridFS."""
+from __future__ import annotations
+
 import datetime
 import io
 import math
 import os
-from typing import Any, Iterable, List, Mapping, NoReturn, Optional
+from typing import Any, Iterable, Mapping, NoReturn, Optional
 
 from bson.binary import Binary
 from bson.int64 import Int64
@@ -480,7 +482,7 @@ def __init__(
     upload_date: datetime.datetime = _grid_out_property(
         "uploadDate", "Date that this file was first uploaded."
     )
-    aliases: Optional[List[str]] = _grid_out_property("aliases", "List of aliases for this file.")
+    aliases: Optional[list[str]] = _grid_out_property("aliases", "List of aliases for this file.")
     metadata: Optional[Mapping[str, Any]] = _grid_out_property(
         "metadata", "Metadata attached to this file."
     )

pymongo/__init__.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 """Python driver for MongoDB."""
+from __future__ import annotations
 
 from typing import ContextManager, Optional
 

pymongo/_csot.py

@@ -20,7 +20,7 @@
 import time
 from collections import deque
 from contextvars import ContextVar, Token
-from typing import Any, Callable, Deque, MutableMapping, Optional, Tuple, TypeVar, cast
+from typing import Any, Callable, Deque, MutableMapping, Optional, TypeVar, cast
 
 from pymongo.write_concern import WriteConcern
 
@@ -72,7 +72,7 @@ class _TimeoutContext:
 
     def __init__(self, timeout: Optional[float]):
         self._timeout = timeout
-        self._tokens: Optional[Tuple[Token, Token, Token]] = None
+        self._tokens: Optional[tuple[Token, Token, Token]] = None
 
     def __enter__(self) -> _TimeoutContext:
         timeout_token = TIMEOUT.set(self._timeout)

pymongo/bulk.py

@@ -24,13 +24,10 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Dict,
     Iterator,
-    List,
     Mapping,
     NoReturn,
     Optional,
-    Tuple,
     Type,
     Union,
 )
@@ -76,7 +73,7 @@
 _UNKNOWN_ERROR: int = 8
 _WRITE_CONCERN_ERROR: int = 64
 
-_COMMANDS: Tuple[str, str, str] = ("insert", "update", "delete")
+_COMMANDS: tuple[str, str, str] = ("insert", "update", "delete")
 
 
 class _Run:
@@ -85,8 +82,8 @@ class _Run:
     def __init__(self, op_type: int) -> None:
         """Initialize a new Run object."""
         self.op_type: int = op_type
-        self.index_map: List[int] = []
-        self.ops: List[Any] = []
+        self.index_map: list[int] = []
+        self.ops: list[Any] = []
         self.idx_offset: int = 0
 
     def index(self, idx: int) -> int:
@@ -182,7 +179,7 @@ def __init__(
             common.validate_is_document_type("let", self.let)
         self.comment: Optional[str] = comment
         self.ordered = ordered
-        self.ops: List[Tuple[int, Mapping[str, Any]]] = []
+        self.ops: list[tuple[int, Mapping[str, Any]]] = []
         self.executed = False
         self.bypass_doc_val = bypass_document_validation
         self.uses_collation = False
@@ -219,12 +216,12 @@ def add_update(
         multi: bool = False,
         upsert: bool = False,
         collation: Optional[Mapping[str, Any]] = None,
-        array_filters: Optional[List[Mapping[str, Any]]] = None,
+        array_filters: Optional[list[Mapping[str, Any]]] = None,
         hint: Union[str, SON[str, Any], None] = None,
     ) -> None:
         """Create an update document and add it to the list of ops."""
         validate_ok_for_update(update)
-        cmd: Dict[str, Any] = dict(
+        cmd: dict[str, Any] = dict(
             [("q", selector), ("u", update), ("multi", multi), ("upsert", upsert)]
         )
         if collation is not None:
@@ -414,7 +411,7 @@ def execute_command(
         generator: Iterator[Any],
         write_concern: WriteConcern,
         session: Optional[ClientSession],
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Execute using write commands."""
         # nModified is only reported for write commands, not legacy ops.
         full_result = {

pymongo/change_stream.py

@@ -16,17 +16,7 @@
 from __future__ import annotations
 
 import copy
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Dict,
-    Generic,
-    List,
-    Mapping,
-    Optional,
-    Type,
-    Union,
-)
+from typing import TYPE_CHECKING, Any, Generic, Mapping, Optional, Type, Union
 
 from bson import _bson_to_dict
 from bson.raw_bson import RawBSONDocument
@@ -173,9 +163,9 @@ def _client(self) -> MongoClient:
         """
         raise NotImplementedError
 
-    def _change_stream_options(self) -> Dict[str, Any]:
+    def _change_stream_options(self) -> dict[str, Any]:
         """Return the options dict for the $changeStream pipeline stage."""
-        options: Dict[str, Any] = {}
+        options: dict[str, Any] = {}
         if self._full_document is not None:
             options["fullDocument"] = self._full_document
 
@@ -197,7 +187,7 @@ def _change_stream_options(self) -> Dict[str, Any]:
 
         return options
 
-    def _command_options(self) -> Dict[str, Any]:
+    def _command_options(self) -> dict[str, Any]:
         """Return the options dict for the aggregation command."""
         options = {}
         if self._max_await_time_ms is not None:
@@ -206,7 +196,7 @@ def _command_options(self) -> Dict[str, Any]:
             options["batchSize"] = self._batch_size
         return options
 
-    def _aggregation_pipeline(self) -> List[Dict[str, Any]]:
+    def _aggregation_pipeline(self) -> list[dict[str, Any]]:
         """Return the full aggregation pipeline for this ChangeStream."""
         options = self._change_stream_options()
         full_pipeline: list = [{"$changeStream": options}]
@@ -491,7 +481,7 @@ class ClusterChangeStream(DatabaseChangeStream, Generic[_DocumentType]):
     .. versionadded:: 3.7
     """
 
-    def _change_stream_options(self) -> Dict[str, Any]:
+    def _change_stream_options(self) -> dict[str, Any]:
         options = super()._change_stream_options()
         options["allChangesForCluster"] = True
         return options

pymongo/client_options.py

@@ -15,7 +15,7 @@
 """Tools to parse mongo client options."""
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, List, Mapping, Optional, Sequence, Tuple, cast
+from typing import TYPE_CHECKING, Any, Mapping, Optional, Sequence, cast
 
 from bson.codec_options import _parse_codec_options
 from pymongo import common
@@ -80,7 +80,7 @@ def _parse_read_concern(options: Mapping[str, Any]) -> ReadConcern:
     return ReadConcern(concern)
 
 
-def _parse_ssl_options(options: Mapping[str, Any]) -> Tuple[Optional[SSLContext], bool]:
+def _parse_ssl_options(options: Mapping[str, Any]) -> tuple[Optional[SSLContext], bool]:
     """Parse ssl options."""
     use_tls = options.get("tls")
     if use_tls is not None:
@@ -309,7 +309,7 @@ def load_balanced(self) -> Optional[bool]:
         return self.__load_balanced
 
     @property
-    def event_listeners(self) -> List[_EventListeners]:
+    def event_listeners(self) -> list[_EventListeners]:
         """The event listeners registered for this client.
 
         See :mod:`~pymongo.monitoring` for details.

pymongo/client_session.py

@@ -144,8 +144,6 @@
     Any,
     Callable,
     ContextManager,
-    Dict,
-    List,
     Mapping,
     MutableMapping,
     NoReturn,
@@ -832,7 +830,7 @@ def abort_transaction(self) -> None:
             self._transaction.state = _TxnState.ABORTED
             self._unpin()
 
-    def _finish_transaction_with_retry(self, command_name: str) -> Dict[str, Any]:
+    def _finish_transaction_with_retry(self, command_name: str) -> dict[str, Any]:
         """Run commit or abort with one retry after any retryable error.
 
         :Parameters:
@@ -841,12 +839,12 @@ def _finish_transaction_with_retry(self, command_name: str) -> Dict[str, Any]:
 
         def func(
             session: Optional[ClientSession], conn: Connection, retryable: bool
-        ) -> Dict[str, Any]:
+        ) -> dict[str, Any]:
             return self._finish_transaction(conn, command_name)
 
         return self._client._retry_internal(func, self, None, retryable=True)
 
-    def _finish_transaction(self, conn: Connection, command_name: str) -> Dict[str, Any]:
+    def _finish_transaction(self, conn: Connection, command_name: str) -> dict[str, Any]:
         self._transaction.attempt += 1
         opts = self._transaction.opts
         assert opts
@@ -1102,7 +1100,7 @@ def reset(self) -> None:
         self.generation += 1
         self.clear()
 
-    def pop_all(self) -> List[_ServerSession]:
+    def pop_all(self) -> list[_ServerSession]:
         ids = []
         while self:
             ids.append(self.pop().session_id)

pymongo/collation.py

@@ -16,7 +16,9 @@
 
 .. _collations: https://www.mongodb.com/docs/manual/reference/collation/
 """
-from typing import Any, Dict, Mapping, Optional, Union
+from __future__ import annotations
+
+from typing import Any, Mapping, Optional, Union
 
 from pymongo import common
 
@@ -166,7 +168,7 @@ def __init__(
         **kwargs: Any,
     ) -> None:
         locale = common.validate_string("locale", locale)
-        self.__document: Dict[str, Any] = {"locale": locale}
+        self.__document: dict[str, Any] = {"locale": locale}
         if caseLevel is not None:
             self.__document["caseLevel"] = common.validate_boolean("caseLevel", caseLevel)
         if caseFirst is not None:
@@ -190,7 +192,7 @@ def __init__(
         self.__document.update(kwargs)
 
     @property
-    def document(self) -> Dict[str, Any]:
+    def document(self) -> dict[str, Any]:
         """The document representation of this collation.
 
         .. note::
@@ -214,7 +216,7 @@ def __ne__(self, other: Any) -> bool:
 
 def validate_collation_or_none(
     value: Optional[Union[Mapping[str, Any], Collation]]
-) -> Optional[Dict[str, Any]]:
+) -> Optional[dict[str, Any]]:
     if value is None:
         return None
     if isinstance(value, Collation):