PYTHON-3171 Add usage of NoReturn annotation (#901)

Author: blink1073

bson/__init__.py

@@ -76,6 +76,7 @@
     List,
     Mapping,
     MutableMapping,
+    NoReturn,
     Optional,
     Sequence,
     Tuple,
@@ -170,7 +171,7 @@ def get_data_and_view(data: Any) -> Tuple[Any, memoryview]:
     return view.tobytes(), view
 
 
-def _raise_unknown_type(element_type: int, element_name: str) -> None:
+def _raise_unknown_type(element_type: int, element_name: str) -> NoReturn:
     """Unknown type helper."""
     raise InvalidBSON(
         "Detected unknown BSON type %r for fieldname '%s'. Are "

bson/objectid.py

@@ -24,15 +24,15 @@
 import threading
 import time
 from random import SystemRandom
-from typing import Any, Optional, Type, Union
+from typing import Any, NoReturn, Optional, Type, Union
 
 from bson.errors import InvalidId
 from bson.tz_util import utc
 
 _MAX_COUNTER_VALUE = 0xFFFFFF
 
 
-def _raise_invalid_id(oid: str) -> None:
+def _raise_invalid_id(oid: str) -> NoReturn:
     raise InvalidId(
         "%r is not a valid ObjectId, it must be a 12-byte input"
         " or a 24-character hex string" % oid

gridfs/grid_file.py

@@ -17,7 +17,7 @@
 import io
 import math
 import os
-from typing import Any, Iterable, List, Mapping, Optional
+from typing import Any, Iterable, List, Mapping, NoReturn, Optional
 
 from bson.binary import Binary
 from bson.int64 import Int64
@@ -298,7 +298,7 @@ def __flush(self) -> Any:
         except DuplicateKeyError:
             self._raise_file_exists(self._id)
 
-    def _raise_file_exists(self, file_id: Any) -> None:
+    def _raise_file_exists(self, file_id: Any) -> NoReturn:
         """Raise a FileExists exception for the given file_id."""
         raise FileExists("file with _id %r already exists" % file_id)
 
@@ -312,7 +312,7 @@ def close(self) -> None:
             self.__flush()
             object.__setattr__(self, "_closed", True)
 
-    def read(self, size: Optional[int] = -1) -> None:
+    def read(self, size: int = -1) -> NoReturn:
         raise io.UnsupportedOperation("read")
 
     def readable(self) -> bool:
@@ -682,10 +682,10 @@ def close(self) -> None:
             self.__chunk_iter = None
         super().close()
 
-    def write(self, value: Any) -> None:
+    def write(self, value: Any) -> NoReturn:
         raise io.UnsupportedOperation("write")
 
-    def writelines(self, lines: Any) -> None:
+    def writelines(self, lines: Any) -> NoReturn:
         raise io.UnsupportedOperation("writelines")
 
     def writable(self) -> bool:
@@ -704,7 +704,7 @@ def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> Any:
         self.close()
         return False
 
-    def fileno(self) -> int:
+    def fileno(self) -> NoReturn:
         raise io.UnsupportedOperation("fileno")
 
     def flush(self) -> None:
@@ -714,7 +714,7 @@ def flush(self) -> None:
     def isatty(self) -> bool:
         return False
 
-    def truncate(self, size: Optional[int] = None) -> int:
+    def truncate(self, size: Optional[int] = None) -> NoReturn:
         # See https://docs.python.org/3/library/io.html#io.IOBase.writable
         # for why truncate has to raise.
         raise io.UnsupportedOperation("truncate")
@@ -891,10 +891,10 @@ def next(self) -> GridOut:
 
     __next__ = next
 
-    def add_option(self, *args: Any, **kwargs: Any) -> None:  # type: ignore[override]
+    def add_option(self, *args: Any, **kwargs: Any) -> NoReturn:
         raise NotImplementedError("Method does not exist for GridOutCursor")
 
-    def remove_option(self, *args: Any, **kwargs: Any) -> None:  # type: ignore[override]
+    def remove_option(self, *args: Any, **kwargs: Any) -> NoReturn:
         raise NotImplementedError("Method does not exist for GridOutCursor")
 
     def _clone_base(self, session: ClientSession) -> "GridOutCursor":

pymongo/bulk.py

@@ -18,6 +18,7 @@
 """
 import copy
 from itertools import islice
+from typing import Any, NoReturn
 
 from bson.objectid import ObjectId
 from bson.raw_bson import RawBSONDocument
@@ -128,7 +129,7 @@ def _merge_command(run, full_result, offset, result):
         full_result["writeConcernErrors"].append(wce)
 
 
-def _raise_bulk_write_error(full_result):
+def _raise_bulk_write_error(full_result: Any) -> NoReturn:
     """Raise a BulkWriteError from the full bulk api result."""
     if full_result["writeErrors"]:
         full_result["writeErrors"].sort(key=lambda error: error["index"])

pymongo/client_session.py

@@ -142,6 +142,7 @@
     ContextManager,
     Generic,
     Mapping,
+    NoReturn,
     Optional,
     TypeVar,
 )
@@ -422,7 +423,7 @@ def __del__(self):
             self.sock_mgr = None
 
 
-def _reraise_with_unknown_commit(exc):
+def _reraise_with_unknown_commit(exc: Any) -> NoReturn:
     """Re-raise an exception with the UnknownTransactionCommitResult label."""
     exc._add_error_label("UnknownTransactionCommitResult")
     raise
@@ -1003,7 +1004,7 @@ def _update_read_concern(self, cmd, sock_info):
             if self._snapshot_time is not None:
                 rc["atClusterTime"] = self._snapshot_time
 
-    def __copy__(self):
+    def __copy__(self) -> NoReturn:
         raise TypeError("A ClientSession cannot be copied, create a new session instead")
 
 

pymongo/collection.py

@@ -23,6 +23,7 @@
     List,
     Mapping,
     MutableMapping,
+    NoReturn,
     Optional,
     Sequence,
     Tuple,
@@ -343,7 +344,7 @@ def __ne__(self, other: Any) -> bool:
     def __hash__(self) -> int:
         return hash((self.__database, self.__name))
 
-    def __bool__(self) -> bool:
+    def __bool__(self) -> NoReturn:
         raise NotImplementedError(
             "Collection objects do not implement truth "
             "value testing or bool(). Please compare "
@@ -3143,12 +3144,12 @@ def find_one_and_update(
     def __iter__(self) -> "Collection[_DocumentType]":
         return self
 
-    def __next__(self) -> None:
+    def __next__(self) -> NoReturn:
         raise TypeError("'Collection' object is not iterable")
 
     next = __next__
 
-    def __call__(self, *args: Any, **kwargs: Any) -> None:
+    def __call__(self, *args: Any, **kwargs: Any) -> NoReturn:
         """This is only here so that some API misusages are easier to debug."""
         if "." not in self.__name:
             raise TypeError(

pymongo/command_cursor.py

@@ -15,7 +15,7 @@
 """CommandCursor class to iterate over command results."""
 
 from collections import deque
-from typing import TYPE_CHECKING, Any, Generic, Iterator, Mapping, Optional
+from typing import TYPE_CHECKING, Any, Generic, Iterator, Mapping, NoReturn, Optional
 
 from bson import _convert_raw_document_lists_to_streams
 from pymongo.cursor import _CURSOR_CLOSED_ERRORS, _SocketManager
@@ -344,5 +344,5 @@ def _unpack_response(
             _convert_raw_document_lists_to_streams(raw_response[0])
         return raw_response
 
-    def __getitem__(self, index):
+    def __getitem__(self, index: int) -> NoReturn:
         raise InvalidOperation("Cannot call __getitem__ on RawBatchCursor")

pymongo/common.py

@@ -25,6 +25,7 @@
     List,
     Mapping,
     MutableMapping,
+    NoReturn,
     Optional,
     Sequence,
     Tuple,
@@ -153,7 +154,7 @@ def clean_node(node: str) -> Tuple[str, int]:
     return host.lower(), port
 
 
-def raise_config_error(key: str, dummy: Any) -> None:
+def raise_config_error(key: str, dummy: Any) -> NoReturn:
     """Raise ConfigurationError with the given key name."""
     raise ConfigurationError("Unknown option %s" % (key,))
 

pymongo/cursor.py

@@ -25,6 +25,7 @@
     Iterable,
     List,
     Mapping,
+    NoReturn,
     Optional,
     Sequence,
     Tuple,
@@ -1339,5 +1340,5 @@ def explain(self) -> _DocumentType:
         clone = self._clone(deepcopy=True, base=Cursor(self.collection))
         return clone.explain()
 
-    def __getitem__(self, index: Any) -> "Cursor[_DocumentType]":
+    def __getitem__(self, index: Any) -> NoReturn:
         raise InvalidOperation("Cannot call __getitem__ on RawBatchCursor")

pymongo/database.py

@@ -21,6 +21,7 @@
     List,
     Mapping,
     MutableMapping,
+    NoReturn,
     Optional,
     Sequence,
     TypeVar,
@@ -1010,12 +1011,12 @@ def validate_collection(
     def __iter__(self) -> "Database[_DocumentType]":
         return self
 
-    def __next__(self) -> "Database[_DocumentType]":
+    def __next__(self) -> NoReturn:
         raise TypeError("'Database' object is not iterable")
 
     next = __next__
 
-    def __bool__(self) -> bool:
+    def __bool__(self) -> NoReturn:
         raise NotImplementedError(
             "Database objects do not implement truth "
             "value testing or bool(). Please compare "