Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions bson/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,12 @@
from codecs import utf_8_decode as _utf_8_decode
from codecs import utf_8_encode as _utf_8_encode
from collections import abc as _abc
from collections.abc import Generator, Iterator, Mapping, MutableMapping, Sequence
from collections.abc import Callable, Generator, Iterator, Mapping, MutableMapping, Sequence
from typing import (
IO,
TYPE_CHECKING,
Any,
BinaryIO,
Callable,
NoReturn,
Optional,
TypeVar,
Expand Down
3 changes: 1 addition & 2 deletions bson/codec_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@
import abc
import datetime
import enum
from collections.abc import Iterable, Mapping
from collections.abc import Callable, Iterable, Mapping
from collections.abc import MutableMapping as _MutableMapping
from typing import (
TYPE_CHECKING,
Any,
Callable,
Generic,
NamedTuple,
Optional,
Expand Down
3 changes: 1 addition & 2 deletions bson/json_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,10 @@
import math
import re
import uuid
from collections.abc import Mapping, MutableMapping, Sequence
from collections.abc import Callable, Mapping, MutableMapping, Sequence
from typing import (
TYPE_CHECKING,
Any,
Callable,
Optional,
Union,
cast,
Expand Down
4 changes: 2 additions & 2 deletions pymongo/_csot.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import inspect
import time
from collections import deque
from collections.abc import MutableMapping
from collections.abc import Callable, MutableMapping
from contextlib import AbstractContextManager
from contextvars import ContextVar, Token
from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, cast
from typing import TYPE_CHECKING, Any, Optional, TypeVar, cast

if TYPE_CHECKING:
from pymongo.write_concern import WriteConcern
Expand Down
4 changes: 2 additions & 2 deletions pymongo/_kms_connect_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
import threading
import time
import urllib.parse
from collections.abc import Awaitable, Mapping
from collections.abc import Awaitable, Callable, Mapping
from dataclasses import dataclass
from typing import Any, Callable, Optional
from typing import Any, Optional

from pymongo.errors import ConfigurationError

Expand Down
3 changes: 1 addition & 2 deletions pymongo/asynchronous/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
import hmac
import socket
from base64 import standard_b64decode, standard_b64encode
from collections.abc import Coroutine, Mapping
from collections.abc import Callable, Coroutine, Mapping
from typing import (
TYPE_CHECKING,
Any,
Callable,
)
from urllib.parse import quote

Expand Down
3 changes: 1 addition & 2 deletions pymongo/asynchronous/client_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,12 @@
import asyncio
import random
import time
from collections.abc import Awaitable
from collections.abc import Awaitable, Callable
from contextlib import AbstractAsyncContextManager
from contextvars import ContextVar, Token
from typing import (
TYPE_CHECKING,
Any,
Callable,
Optional,
TypeVar,
)
Expand Down
11 changes: 9 additions & 2 deletions pymongo/asynchronous/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,18 @@

import warnings
from collections import abc
from collections.abc import Coroutine, Iterable, Iterator, Mapping, MutableMapping, Sequence
from collections.abc import (
Callable,
Coroutine,
Iterable,
Iterator,
Mapping,
MutableMapping,
Sequence,
)
from typing import (
TYPE_CHECKING,
Any,
Callable,
Generic,
NoReturn,
Optional,
Expand Down
3 changes: 1 addition & 2 deletions pymongo/asynchronous/command_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@

import datetime
import time
from collections.abc import Mapping, MutableMapping, Sequence
from collections.abc import Callable, Mapping, MutableMapping, Sequence
from typing import (
TYPE_CHECKING,
Any,
Callable,
Optional,
Union,
cast,
Expand Down
2 changes: 1 addition & 1 deletion pymongo/asynchronous/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import builtins
import functools
import socket
from collections.abc import Callable
from typing import (
Any,
Callable,
TypeVar,
cast,
)
Expand Down
11 changes: 9 additions & 2 deletions pymongo/asynchronous/mongo_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,18 @@
import warnings
import weakref
from collections import defaultdict
from collections.abc import AsyncGenerator, Collection, Coroutine, Mapping, MutableMapping, Sequence
from collections.abc import (
AsyncGenerator,
Callable,
Collection,
Coroutine,
Mapping,
MutableMapping,
Sequence,
)
from typing import (
TYPE_CHECKING,
Any,
Callable,
Generic,
NoReturn,
Optional,
Expand Down
4 changes: 2 additions & 2 deletions pymongo/asynchronous/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
from __future__ import annotations

import threading
from collections.abc import Collection
from typing import Callable, Optional
from collections.abc import Callable, Collection
from typing import Optional

from bson.objectid import ObjectId
from pymongo import common
Expand Down
3 changes: 2 additions & 1 deletion pymongo/asynchronous/srv_resolver.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

import ipaddress
import random
from typing import TYPE_CHECKING, Any, Callable, Optional, Union
from collections.abc import Callable
from typing import TYPE_CHECKING, Any, Optional, Union

from pymongo._psl import SPECIAL_USE_LABELS, _to_punycode, is_public_suffix
from pymongo._telemetry import log_srv_monitor_invalid_host
Expand Down
4 changes: 2 additions & 2 deletions pymongo/asynchronous/topology.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
import time
import warnings
import weakref
from collections.abc import Mapping
from collections.abc import Callable, Mapping
from pathlib import Path
from typing import TYPE_CHECKING, Any, Callable, Optional, cast
from typing import TYPE_CHECKING, Any, Optional, cast

from pymongo import _csot, common, helpers_shared, periodic_executor
from pymongo._telemetry import (
Expand Down
3 changes: 2 additions & 1 deletion pymongo/asynchronous/uri_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

from __future__ import annotations

from typing import Any, Callable, Optional
from collections.abc import Callable
from typing import Any, Optional

from pymongo.asynchronous.srv_resolver import _SrvResolver
from pymongo.common import SRV_SERVICE_NAME, _CaseInsensitiveDictionary
Expand Down
4 changes: 2 additions & 2 deletions pymongo/auth_oidc_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

import abc
import os
from collections.abc import Mapping, MutableMapping
from collections.abc import Callable, Mapping, MutableMapping
from dataclasses import dataclass, field
from typing import TYPE_CHECKING, Any, Callable, Optional
from typing import TYPE_CHECKING, Any, Optional
from urllib.parse import quote

import bson
Expand Down
4 changes: 2 additions & 2 deletions pymongo/auth_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import typing
from base64 import standard_b64encode
from collections import namedtuple
from collections.abc import Mapping, MutableMapping
from typing import TYPE_CHECKING, Any, Callable, Optional, cast
from collections.abc import Callable, Mapping, MutableMapping
from typing import TYPE_CHECKING, Any, Optional, cast

from bson import Binary
from pymongo.auth_oidc_shared import (
Expand Down
3 changes: 1 addition & 2 deletions pymongo/client_session_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
import collections
import time
import uuid
from collections.abc import Mapping, MutableMapping
from collections.abc import Callable, Mapping, MutableMapping
from typing import (
TYPE_CHECKING,
Any,
Callable,
Generic,
NoReturn,
Optional,
Expand Down
3 changes: 1 addition & 2 deletions pymongo/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@
import datetime
import warnings
from collections import OrderedDict, abc
from collections.abc import Iterator, Mapping, MutableMapping, Sequence
from collections.abc import Callable, Iterator, Mapping, MutableMapping, Sequence
from difflib import get_close_matches
from importlib.metadata import requires, version
from typing import (
TYPE_CHECKING,
Any,
Callable,
NoReturn,
Optional,
Union,
Expand Down
4 changes: 2 additions & 2 deletions pymongo/encryption_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
from __future__ import annotations

import warnings
from collections.abc import Mapping
from typing import TYPE_CHECKING, Any, Callable, Optional, TypedDict
from collections.abc import Callable, Mapping
from typing import TYPE_CHECKING, Any, Optional, TypedDict

from pymongo.uri_parser_shared import _parse_kms_tls_options

Expand Down
3 changes: 1 addition & 2 deletions pymongo/message.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@

import random
import struct
from collections.abc import Iterable, Mapping, MutableMapping
from collections.abc import Callable, Iterable, Mapping, MutableMapping
from io import BytesIO as _BytesIO
from typing import (
TYPE_CHECKING,
Any,
Callable,
NoReturn,
Optional,
Union,
Expand Down
4 changes: 2 additions & 2 deletions pymongo/mongo_client_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

from __future__ import annotations

from collections.abc import Mapping
from typing import TYPE_CHECKING, Any, Callable, Generic, Optional, TypeVar, Union, cast
from collections.abc import Callable, Mapping
from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar, Union, cast

from pymongo import _csot
from pymongo._telemetry import _generate_op_id_or_none, log_command_retry
Expand Down
2 changes: 1 addition & 1 deletion pymongo/network_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
import sys
import time
from asyncio import AbstractEventLoop, BaseTransport, BufferedProtocol, Future, Transport
from collections.abc import Callable
from typing import (
TYPE_CHECKING,
Any,
Callable,
Optional,
Union,
)
Expand Down
3 changes: 2 additions & 1 deletion pymongo/pyopenssl_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@
import ssl as _stdlibssl
import sys as _sys
import time as _time
from collections.abc import Callable
from errno import EINTR as _EINTR
from ipaddress import ip_address as _ip_address
from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, Union
from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union

import cryptography.x509 as x509
import service_identity
Expand Down
4 changes: 2 additions & 2 deletions pymongo/settings_shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import threading
import traceback
from collections.abc import Collection
from typing import Any, Callable, Generic, Optional, TypeVar, Union
from collections.abc import Callable, Collection
from typing import Any, Generic, Optional, TypeVar, Union

from bson.objectid import ObjectId
from pymongo import common
Expand Down
3 changes: 1 addition & 2 deletions pymongo/synchronous/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,10 @@
import hmac
import socket
from base64 import standard_b64decode, standard_b64encode
from collections.abc import Mapping
from collections.abc import Callable, Mapping
from typing import (
TYPE_CHECKING,
Any,
Callable,
)
from urllib.parse import quote

Expand Down
2 changes: 1 addition & 1 deletion pymongo/synchronous/client_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@

import random
import time
from collections.abc import Callable
from contextlib import AbstractContextManager
from contextvars import ContextVar, Token
from typing import (
TYPE_CHECKING,
Any,
Callable,
Optional,
TypeVar,
)
Expand Down
10 changes: 8 additions & 2 deletions pymongo/synchronous/collection.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,17 @@

import warnings
from collections import abc
from collections.abc import Iterable, Iterator, Mapping, MutableMapping, Sequence
from collections.abc import (
Callable,
Iterable,
Iterator,
Mapping,
MutableMapping,
Sequence,
)
from typing import (
TYPE_CHECKING,
Any,
Callable,
Generic,
NoReturn,
Optional,
Expand Down
3 changes: 1 addition & 2 deletions pymongo/synchronous/command_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,10 @@

import datetime
import time
from collections.abc import Mapping, MutableMapping, Sequence
from collections.abc import Callable, Mapping, MutableMapping, Sequence
from typing import (
TYPE_CHECKING,
Any,
Callable,
Optional,
Union,
cast,
Expand Down
2 changes: 1 addition & 1 deletion pymongo/synchronous/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
import builtins
import functools
import socket
from collections.abc import Callable
from typing import (
Any,
Callable,
TypeVar,
cast,
)
Expand Down
Loading
Loading