From 2db512f5d509e52ed0bc9cde55acd028dc81e022 Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Mon, 14 Feb 2022 16:14:36 -0600 Subject: [PATCH] PYTHON-3078 Remove Use of Unsupported NoReturn Type Class (#864) --- .evergreen/config.yml | 2 +- bson/__init__.py | 3 +-- bson/objectid.py | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.evergreen/config.yml b/.evergreen/config.yml index 2a6532430..8edc43df2 100644 --- a/.evergreen/config.yml +++ b/.evergreen/config.yml @@ -1729,7 +1729,7 @@ tasks: vars: VERSION: "latest" TOPOLOGY: "server" - PYTHON_BINARY: "/opt/mongodbtoolchain/v3/bin/python3" + PYTHON_BINARY: "/opt/mongodbtoolchain/v2/bin/python3" - func: "run tests" # }}} - name: "coverage-report" diff --git a/bson/__init__.py b/bson/__init__.py index 9431909f9..d9124d1b3 100644 --- a/bson/__init__.py +++ b/bson/__init__.py @@ -76,7 +76,6 @@ from typing import ( List, Mapping, MutableMapping, - NoReturn, Sequence, Tuple, Type, @@ -167,7 +166,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) -> NoReturn: +def _raise_unknown_type(element_type: int, element_name: str) -> None: """Unknown type helper.""" raise InvalidBSON( "Detected unknown BSON type %r for fieldname '%s'. Are " diff --git a/bson/objectid.py b/bson/objectid.py index 9ad3ed60b..7413fd497 100644 --- a/bson/objectid.py +++ b/bson/objectid.py @@ -24,7 +24,7 @@ import struct import threading import time from random import SystemRandom -from typing import Any, NoReturn, Optional, Type, Union +from typing import Any, Optional, Type, Union from bson.errors import InvalidId from bson.tz_util import utc @@ -32,7 +32,7 @@ from bson.tz_util import utc _MAX_COUNTER_VALUE = 0xFFFFFF -def _raise_invalid_id(oid: str) -> NoReturn: +def _raise_invalid_id(oid: str) -> None: raise InvalidId( "%r is not a valid ObjectId, it must be a 12-byte input" " or a 24-character hex string" % oid