refactor: use denokv._pycompat.typing everywhere

Author: h4l

src/denokv/_pycompat/enum.py

@@ -4,11 +4,9 @@
 from enum import EnumMeta
 from enum import Flag
 from enum import IntFlag
-from typing import TYPE_CHECKING
-from typing import Iterator
 
-if TYPE_CHECKING:
-    from typing_extensions import Self
+from denokv._pycompat.typing import Iterator
+from denokv._pycompat.typing import Self
 
 
 class ContainsValueEnumMeta(EnumMeta):

src/denokv/_rfc3339.py

@@ -4,10 +4,10 @@
 from datetime import datetime
 from datetime import timedelta
 from datetime import timezone
-from typing import Final
-from typing import TypedDict
-from typing import cast
 
+from denokv._pycompat.typing import Final
+from denokv._pycompat.typing import TypedDict
+from denokv._pycompat.typing import cast
 from denokv.result import Err
 from denokv.result import Ok
 from denokv.result import Result

src/denokv/auth.py

@@ -2,9 +2,6 @@
 
 from dataclasses import dataclass
 from datetime import datetime
-from typing import Mapping
-from typing import Sequence
-from typing import cast
 from uuid import UUID
 
 import aiohttp
@@ -13,6 +10,9 @@
 
 from denokv._pycompat.dataclasses import slots_if310
 from denokv._pycompat.enum import StrEnum
+from denokv._pycompat.typing import Mapping
+from denokv._pycompat.typing import Sequence
+from denokv._pycompat.typing import cast
 from denokv._rfc3339 import parse_rfc3339_datetime
 from denokv.errors import DenoKvError
 from denokv.errors import DenoKvValidationError

src/denokv/backoff.py

@@ -6,14 +6,12 @@
 from dataclasses import dataclass
 from enum import IntEnum
 from itertools import count
-from typing import TYPE_CHECKING
-from typing import Callable
-from typing import Iterable
-from typing import Iterator
 from typing import Literal
 
-if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
+from denokv._pycompat.typing import Callable
+from denokv._pycompat.typing import Iterable
+from denokv._pycompat.typing import Iterator
+from denokv._pycompat.typing import TypeAlias
 
 Backoff: TypeAlias = Iterable[float]
 """

src/denokv/datapath.py

@@ -9,17 +9,7 @@
 from dataclasses import dataclass
 from enum import Enum
 from enum import auto
-from typing import TYPE_CHECKING
-from typing import Awaitable
-from typing import Callable
-from typing import Container
-from typing import Final
-from typing import Protocol
-from typing import Type
-from typing import TypedDict
-from typing import Union
 from typing import overload
-from typing import runtime_checkable
 
 import aiohttp
 import aiohttp.client_exceptions
@@ -34,6 +24,19 @@
 from denokv._datapath_pb2 import SnapshotReadOutput
 from denokv._datapath_pb2 import SnapshotReadStatus
 from denokv._datapath_pb2 import ValueEncoding
+from denokv._pycompat.typing import Awaitable
+from denokv._pycompat.typing import Callable
+from denokv._pycompat.typing import Container
+from denokv._pycompat.typing import Final
+from denokv._pycompat.typing import Protocol
+from denokv._pycompat.typing import Type
+from denokv._pycompat.typing import TypeAlias
+from denokv._pycompat.typing import TypedDict
+from denokv._pycompat.typing import TypeGuard
+from denokv._pycompat.typing import TypeVar
+from denokv._pycompat.typing import Union
+from denokv._pycompat.typing import Unpack
+from denokv._pycompat.typing import runtime_checkable
 from denokv.auth import ConsistencyLevel
 from denokv.auth import DatabaseMetadata
 from denokv.auth import EndpointInfo
@@ -45,55 +48,30 @@
 KV_KEY_PIECE_TYPES: Final = (str, bytes, int, float, bool)
 
 
-if TYPE_CHECKING:
-    from typing_extensions import TypeAlias
-    from typing_extensions import TypeGuard
-    from typing_extensions import TypeVar
-    from typing_extensions import Unpack
+KvKeyPiece: TypeAlias = Union[str, bytes, int, float, bool]
+KvKeyPieceT = TypeVar("KvKeyPieceT", bound=KvKeyPiece, default=KvKeyPiece)
 
-    KvKeyPiece: TypeAlias = Union[str, bytes, int, float, bool]
-    KvKeyPieceT = TypeVar("KvKeyPieceT", bound=KvKeyPiece, default=KvKeyPiece)
-
-    KvKeyTuple: TypeAlias = tuple[KvKeyPieceT, ...]
-    KvKeyTupleT = TypeVar("KvKeyTupleT", bound=KvKeyTuple, default=KvKeyTuple)
-    KvKeyTupleT_co = TypeVar(
-        "KvKeyTupleT_co", bound=KvKeyTuple, default=KvKeyTuple, covariant=True
-    )
-
-    @runtime_checkable
-    class KvKeyEncodable(Protocol):
-        __slots__ = ()
-
-        def kv_key_bytes(self) -> bytes: ...
+KvKeyTuple: TypeAlias = tuple[KvKeyPieceT, ...]
+KvKeyTupleT = TypeVar("KvKeyTupleT", bound=KvKeyTuple, default=KvKeyTuple)
+KvKeyTupleT_co = TypeVar(
+    "KvKeyTupleT_co", bound=KvKeyTuple, default=KvKeyTuple, covariant=True
+)
 
-    KvKeyEncodableT = TypeVar("KvKeyEncodableT", bound=KvKeyEncodable)
-    AnyKvKey: TypeAlias = "KvKeyEncodable | KvKeyTuple"
-    AnyKvKeyT = TypeVar("AnyKvKeyT", bound=AnyKvKey, default=AnyKvKey)
-    AnyKvKeyT_co = TypeVar(
-        "AnyKvKeyT_co", bound=AnyKvKey, default=AnyKvKey, covariant=True
-    )
-    AnyKvKeyT_con = TypeVar(
-        "AnyKvKeyT_con", bound=AnyKvKey, default=AnyKvKey, contravariant=True
-    )
-else:
-    from typing import TypeVar
 
-    KvKeyPiece: TypeAlias = "str | bytes | int | float | bool"
-    KvKeyPieceT = TypeVar("KvKeyPieceT", bound=KvKeyPiece)
+@runtime_checkable
+class KvKeyEncodable(Protocol):
+    __slots__ = ()
 
-    KvKeyTuple: TypeAlias = tuple[KvKeyPieceT, ...]
-    KvKeyTupleT = TypeVar("KvKeyTupleT", bound=KvKeyTuple)
-    KvKeyTupleT_co = TypeVar("KvKeyTupleT_co", bound=KvKeyTuple, covariant=True)
+    def kv_key_bytes(self) -> bytes: ...
 
-    @runtime_checkable
-    class KvKeyEncodable(Protocol):
-        def kv_key_bytes(self) -> bytes: ...
 
-    KvKeyEncodableT = TypeVar("KvKeyEncodableT", bound=KvKeyEncodable)
-    AnyKvKey: TypeAlias = "KvKeyEncodable | KvKeyTuple"
-    AnyKvKeyT = TypeVar("AnyKvKeyT", bound=AnyKvKey)
-    AnyKvKeyT_co = TypeVar("AnyKvKeyT", bound=AnyKvKey, covariant=True)
-    AnyKvKeyT_con = TypeVar("AnyKvKeyT_con", bound=AnyKvKey, contravariant=True)
+KvKeyEncodableT = TypeVar("KvKeyEncodableT", bound=KvKeyEncodable)
+AnyKvKey: TypeAlias = Union[KvKeyEncodable, KvKeyTuple]
+AnyKvKeyT = TypeVar("AnyKvKeyT", bound=AnyKvKey, default=AnyKvKey)
+AnyKvKeyT_co = TypeVar("AnyKvKeyT_co", bound=AnyKvKey, default=AnyKvKey, covariant=True)
+AnyKvKeyT_con = TypeVar(
+    "AnyKvKeyT_con", bound=AnyKvKey, default=AnyKvKey, contravariant=True
+)
 
 _T = TypeVar("_T")
 
@@ -196,9 +174,9 @@ class RequestUnsuccessful(DataPathDenoKvError):
     pass
 
 
-DataPathError: TypeAlias = (
-    "EndpointNotUsable | RequestUnsuccessful | ResponseUnsuccessful | ProtocolViolation"
-)
+DataPathError: TypeAlias = Union[
+    EndpointNotUsable, RequestUnsuccessful, ResponseUnsuccessful, ProtocolViolation
+]
 
 
 class _DataPathRequestKind(Enum):
@@ -300,7 +278,7 @@ async def _response_body_bytes(response: aiohttp.ClientResponse) -> Ok[bytes]:
         return Ok(await response.read())
 
 
-SnapshotReadResult: TypeAlias = "Result[SnapshotReadOutput, DataPathError]"
+SnapshotReadResult: TypeAlias = Result[SnapshotReadOutput, DataPathError]
 
 
 async def snapshot_read(

src/denokv/errors.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
-from typing import cast
+
+from denokv._pycompat.typing import cast
 
 
 @dataclass(init=False)

src/denokv/kv.py

@@ -12,18 +12,7 @@
 from enum import auto
 from os import environ
 from types import TracebackType
-from typing import TYPE_CHECKING
-from typing import AsyncIterator
-from typing import Awaitable
-from typing import Callable
-from typing import ClassVar
-from typing import Final
-from typing import Generic
-from typing import Iterable
 from typing import Literal
-from typing import Protocol
-from typing import Sequence
-from typing import TypedDict
 from typing import overload
 
 import aiohttp
@@ -36,6 +25,21 @@
 from denokv._datapath_pb2 import SnapshotRead
 from denokv._datapath_pb2 import SnapshotReadOutput
 from denokv._pycompat.dataclasses import slots_if310
+from denokv._pycompat.typing import AsyncIterator
+from denokv._pycompat.typing import Awaitable
+from denokv._pycompat.typing import Callable
+from denokv._pycompat.typing import ClassVar
+from denokv._pycompat.typing import Final
+from denokv._pycompat.typing import Generic
+from denokv._pycompat.typing import Iterable
+from denokv._pycompat.typing import Protocol
+from denokv._pycompat.typing import Self
+from denokv._pycompat.typing import Sequence
+from denokv._pycompat.typing import TypeAlias
+from denokv._pycompat.typing import TypedDict
+from denokv._pycompat.typing import TypeVar
+from denokv._pycompat.typing import TypeVarTuple
+from denokv._pycompat.typing import Unpack
 from denokv._pycompat.typing import override
 from denokv.asyncio import loop_time
 from denokv.auth import ConsistencyLevel
@@ -66,23 +70,10 @@
 from denokv.result import Ok
 from denokv.result import Result
 
-if TYPE_CHECKING:
-    from typing_extensions import Self
-    from typing_extensions import TypeAlias
-    from typing_extensions import TypeVar
-    from typing_extensions import TypeVarTuple
-    from typing_extensions import Unpack
-
-    T = TypeVar("T", default=object)
-    # Note that the default arg doesn't seem to work with MyPy yet. The
-    # DefaultKvKey alias is what this should behave as when defaulted.
-    Pieces = TypeVarTuple("Pieces", default=Unpack[tuple[KvKeyPiece, ...]])
-else:
-    from typing import TypeVar
-
-    T = TypeVar("T")
-    Unpack = tuple  # hack to support py39 at runtime w/o typing_extensions
-    Pieces = TypeVar("Pieces")  # hack to support py39 at runtime w/o typing_extensions
+T = TypeVar("T", default=object)
+# Note that the default arg doesn't seem to work with MyPy yet. The
+# DefaultKvKey alias is what this should behave as when defaulted.
+Pieces = TypeVarTuple("Pieces", default=Unpack[tuple[KvKeyPiece, ...]])
 
 SAFE_FLOAT_INT_RANGE: Final = range(-(2**53 - 1), 2**53)  # 2**53 - 1 is max safe
 
@@ -860,9 +851,9 @@ async def _snapshot_read(
         return Ok((result.value, endpoint))
 
 
-_KvSnapshotReadResult: TypeAlias = (
-    "Result[tuple[SnapshotReadOutput, EndpointInfo], DataPathError]"
-)
+_KvSnapshotReadResult: TypeAlias = Result[
+    tuple[SnapshotReadOutput, EndpointInfo], DataPathError
+]
 
 
 @dataclass(frozen=True)

src/denokv/kv_keys.py

@@ -4,20 +4,26 @@
 import sys
 from dataclasses import dataclass
 from dataclasses import field
-from typing import TYPE_CHECKING
-from typing import Any
-from typing import Final
-from typing import Generic
-from typing import Iterator
-from typing import Sequence
-from typing import Union
-from typing import cast
 from typing import overload
 
 from fdb.tuple import pack
 from fdb.tuple import unpack
 
 from denokv._pycompat.dataclasses import slots_if310
+from denokv._pycompat.typing import TYPE_CHECKING
+from denokv._pycompat.typing import Any
+from denokv._pycompat.typing import Final
+from denokv._pycompat.typing import Generic
+from denokv._pycompat.typing import Iterator
+from denokv._pycompat.typing import Self
+from denokv._pycompat.typing import Sequence
+from denokv._pycompat.typing import SupportsIndex
+from denokv._pycompat.typing import TypeAlias
+from denokv._pycompat.typing import TypeVar
+from denokv._pycompat.typing import TypeVarTuple
+from denokv._pycompat.typing import Union
+from denokv._pycompat.typing import Unpack
+from denokv._pycompat.typing import cast
 from denokv._pycompat.typing import override
 from denokv.datapath import KV_KEY_PIECE_TYPES
 from denokv.datapath import AnyKvKey
@@ -36,24 +42,10 @@
 from denokv.result import Nothing
 from denokv.result import Some
 
-if TYPE_CHECKING:
-    from typing_extensions import Self
-    from typing_extensions import SupportsIndex
-    from typing_extensions import TypeAlias
-    from typing_extensions import TypeVar
-    from typing_extensions import TypeVarTuple
-    from typing_extensions import Unpack
-
-    T = TypeVar("T", default=object)
-    # Note that the default arg doesn't seem to work with MyPy yet. The
-    # DefaultKvKey alias is what this should behave as when defaulted.
-    Pieces = TypeVarTuple("Pieces", default=Unpack[tuple[KvKeyPiece, ...]])
-else:
-    from typing import TypeVar
-
-    T = TypeVar("T")
-    Unpack = tuple  # hack to support py39 at runtime w/o typing_extensions
-    Pieces = TypeVar("Pieces")  # hack to support py39 at runtime w/o typing_extensions
+T = TypeVar("T", default=object)
+# Note that the default arg doesn't seem to work with MyPy yet. The
+# DefaultKvKey alias is what this should behave as when defaulted.
+Pieces = TypeVarTuple("Pieces", default=Unpack[tuple[KvKeyPiece, ...]])
 
 _T_co = TypeVar("_T_co", covariant=True)
 
@@ -447,23 +439,12 @@ def range(cls) -> KvKeyRange[IncludeAll, IncludeAll]:
 StopBoundary: TypeAlias = Union[
     IncludeAll, Include[AnyKvKeyT], IncludePrefix[AnyKvKeyT], Exclude[AnyKvKeyT]
 ]
-
-if TYPE_CHECKING:
-    StartT = TypeVar(
-        "StartT", bound=StartBoundary, default=StartBoundary, covariant=False
-    )
-    StartT_co = TypeVar(
-        "StartT_co", bound=StartBoundary, default=StartBoundary, covariant=True
-    )
-    StopT = TypeVar("StopT", bound=StopBoundary, default=StopBoundary, covariant=False)
-    StopT_co = TypeVar(
-        "StopT_co", bound=StopBoundary, default=StopBoundary, covariant=True
-    )
-else:
-    StartT = TypeVar("StartT", bound=StartBoundary, covariant=False)
-    StopT = TypeVar("StopT", bound=StopBoundary, covariant=False)
-    StartT_co = TypeVar("StartT_co", bound=StartBoundary, covariant=True)
-    StopT_co = TypeVar("StopT_co", bound=StopBoundary, covariant=True)
+StartT = TypeVar("StartT", bound=StartBoundary, default=StartBoundary, covariant=False)
+StartT_co = TypeVar(
+    "StartT_co", bound=StartBoundary, default=StartBoundary, covariant=True
+)
+StopT = TypeVar("StopT", bound=StopBoundary, default=StopBoundary, covariant=False)
+StopT_co = TypeVar("StopT_co", bound=StopBoundary, default=StopBoundary, covariant=True)
 
 
 @functools.total_ordering