Skip to content

Commit 9550687

Browse files
Bernd VerstCopilot
andcommitted
Modernize typing imports to use collections.abc (PEP 585)
Move Callable, Sequence, Generator, Iterable, Iterator, and AsyncIterable imports from typing to collections.abc per PEP 585. These typing aliases have been deprecated for runtime use since Python 3.9 in favor of the collections.abc originals, and the project floor is Python 3.10. No behavior change. Affected files: - durabletask/client.py - durabletask/task.py - durabletask/worker.py - durabletask/testing/in_memory_backend.py - durabletask/internal/client_helpers.py - durabletask/internal/grpc_interceptor.py - durabletask/internal/grpc_resiliency.py - durabletask/internal/history_helpers.py - durabletask/internal/orchestration_entity_context.py - durabletask/internal/proto_task_hub_sidecar_service_stub.py Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 5b8e0c8 commit 9550687

10 files changed

Lines changed: 19 additions & 13 deletions

durabletask/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
import threading
77
import time
88
import uuid
9-
from collections.abc import AsyncIterable, Iterable
9+
from collections.abc import AsyncIterable, Iterable, Sequence
1010
from dataclasses import dataclass
1111
from datetime import datetime
1212
from enum import Enum
13-
from typing import Any, Generic, Protocol, Sequence, TypeVar, cast
13+
from typing import Any, Generic, Protocol, TypeVar, cast
1414

1515
import grpc
1616
import grpc.aio

durabletask/internal/client_helpers.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55

66
import logging
77
import uuid
8+
from collections.abc import Sequence
89
from datetime import datetime, timezone
9-
from typing import TYPE_CHECKING, Any, Sequence, TypeVar
10+
from typing import TYPE_CHECKING, Any, TypeVar
1011

1112
from google.protobuf import wrappers_pb2
1213

durabletask/internal/grpc_interceptor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) Microsoft Corporation.
22
# Licensed under the MIT License.
33

4-
from collections.abc import Iterable, Sequence
5-
from typing import Any, Callable, NamedTuple, cast
4+
from collections.abc import Callable, Iterable, Sequence
5+
from typing import Any, NamedTuple, cast
66

77
import grpc
88
import grpc.aio

durabletask/internal/grpc_resiliency.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33

44
import random
55
import threading
6+
from collections.abc import Callable
67
from dataclasses import dataclass, field
7-
from typing import Any, Callable
8+
from typing import Any
89

910
import grpc
1011
import grpc.aio

durabletask/internal/history_helpers.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
from __future__ import annotations
55

6-
from typing import AsyncIterable, Iterable
7-
6+
from collections.abc import AsyncIterable, Iterable
87
from typing import Any
98

109
import durabletask.history as history

durabletask/internal/orchestration_entity_context.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
from collections.abc import Generator
12
from datetime import datetime
2-
from typing import Any, Generator
3+
from typing import Any
34

45
from durabletask.internal.helpers import get_string_value
56
import durabletask.internal.orchestrator_service_pb2 as pb

durabletask/internal/proto_task_hub_sidecar_service_stub.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
from typing import Any, Callable, Protocol
1+
from collections.abc import Callable
2+
from typing import Any, Protocol
23

34

45
class ProtoTaskHubSidecarServiceStub(Protocol):

durabletask/task.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@
77
import logging
88
import math
99
from abc import ABC, abstractmethod
10+
from collections.abc import Callable, Generator, Sequence
1011
from datetime import datetime, timedelta, timezone
11-
from typing import TYPE_CHECKING, Any, Callable, Generator, Generic, Sequence, TypeAlias, TypeVar, cast
12+
from typing import TYPE_CHECKING, Any, Generic, TypeAlias, TypeVar, cast
1213

1314
from durabletask.entities import DurableEntity, EntityInstanceId, EntityLock, EntityContext
1415
import durabletask.internal.helpers as pbh

durabletask/testing/in_memory_backend.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
import time
1717
import uuid
1818
from collections import deque
19+
from collections.abc import Callable, Iterable, Iterator
1920
from dataclasses import dataclass, field
2021
from datetime import datetime, timezone
21-
from typing import Callable, Iterable, Iterator, TypeAlias, cast
22+
from typing import TypeAlias, cast
2223

2324
import grpc
2425
from concurrent import futures

durabletask/worker.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
import logging
88
import os
99
import time
10+
from collections.abc import Callable, Generator, Sequence
1011
from concurrent.futures import ThreadPoolExecutor
1112
from dataclasses import dataclass, field
1213
from datetime import datetime, timedelta, timezone
1314
from threading import Event, Lock, Thread
1415
from types import GeneratorType
1516
from enum import Enum
16-
from typing import Any, Callable, Generator, Sequence, TypeVar, cast, overload
17+
from typing import Any, TypeVar, cast, overload
1718
import uuid
1819
from packaging.version import InvalidVersion, parse
1920

0 commit comments

Comments
 (0)