Apply ruff/pyupgrade rule UP035

UP035 Import from `collections.abc` instead
UP035 Import from `typing` instead

Author: DimitriPapadopoulos

distributed/active_memory_manager.py

@@ -437,7 +437,7 @@ class Suggestion(NamedTuple):
 
 if TYPE_CHECKING:
     # TODO import from typing (requires Python >=3.10)
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 SuggestionGenerator: TypeAlias = Generator[
     Suggestion, Union["scheduler_module.WorkerState", None], None

distributed/client.py

@@ -29,7 +29,6 @@
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
     ClassVar,
     Generic,
     Literal,
@@ -38,6 +37,7 @@
     TypeVar,
     cast,
 )
+from collections.abc import Callable
 
 from packaging.version import parse as parse_version
 from tlz import first, groupby, merge, partition_all, valmap
@@ -125,7 +125,7 @@
 from distributed.worker import get_client, get_worker, secede
 
 if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 logger = logging.getLogger(__name__)
 

distributed/deploy/adaptive.py

@@ -4,7 +4,8 @@
 from collections.abc import Hashable
 from datetime import timedelta
 from inspect import isawaitable
-from typing import TYPE_CHECKING, Any, Callable, Literal, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
+from collections.abc import Callable
 
 from tornado.ioloop import IOLoop
 
@@ -18,7 +19,7 @@
 from distributed.utils import log_errors
 
 if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
     import distributed
     from distributed.deploy.cluster import Cluster

distributed/diagnostics/plugin.py

@@ -12,7 +12,8 @@
 import uuid
 import zipfile
 from collections.abc import Awaitable
-from typing import TYPE_CHECKING, Any, Callable, ClassVar
+from typing import TYPE_CHECKING, Any, ClassVar
+from collections.abc import Callable
 
 from dask.typing import Key
 from dask.utils import _deprecated_kwarg, funcname, tmpfile

distributed/diagnostics/progressbar.py

@@ -7,7 +7,7 @@
 import weakref
 from contextlib import suppress
 from timeit import default_timer
-from typing import Callable
+from collections.abc import Callable
 
 from tlz import valmap
 from tornado.ioloop import IOLoop

distributed/gc.py

@@ -4,7 +4,8 @@
 import logging
 import threading
 from collections import deque
-from typing import Callable, Final
+from typing import Final
+from collections.abc import Callable
 
 import psutil
 

distributed/protocol/compression.py

@@ -23,7 +23,7 @@
 
 if TYPE_CHECKING:
     # TODO import from typing (requires Python >=3.10)
-    from typing_extensions import TypeAlias
+    from typing import TypeAlias
 
 # TODO remove quotes (requires Python >=3.10)
 AnyBytes: TypeAlias = "bytes | bytearray | memoryview"

distributed/scheduler.py

@@ -150,7 +150,8 @@
     # TODO import from typing (requires Python >=3.11)
     from typing import TypeVar
 
-    from typing_extensions import Self, TypeAlias
+    from typing_extensions import Self
+    from typing import TypeAlias
 
     from dask._expr import Expr
 

distributed/shuffle/_core.py

@@ -49,7 +49,8 @@
 
 if TYPE_CHECKING:
     # TODO import from typing (requires Python >=3.10)
-    from typing_extensions import ParamSpec, TypeAlias
+    from typing_extensions import ParamSpec
+    from typing import TypeAlias
 
     _P = ParamSpec("_P")
 

distributed/shuffle/_memory.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
 from collections import defaultdict, deque
-from typing import Any, Callable
+from typing import Any
+from collections.abc import Callable
 
 from dask.sizeof import sizeof