Remove usage of future annotations

Author: Lemonyte

pyproject.toml

@@ -61,7 +61,7 @@ version = {attr = "contiguity.__version__"}
 [tool.ruff]
 src = ["src"]
 line-length = 119
-target-version = "py39"
+target-version = "py310"
 
 [tool.ruff.lint]
 select = ["ALL"]

src/contiguity/_auth.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import os
 
 

src/contiguity/_client.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from http import HTTPStatus
 
 from httpx import AsyncClient as HttpxAsyncClient
@@ -24,7 +22,7 @@ def handle_error(self, response: Response, /, *, fail_message: str = "api reques
 
 class ApiClient(HttpxClient, BaseApiClient):
     def __init__(
-        self: ApiClient,
+        self: "ApiClient",
         *,
         base_url: str = "https://api.contiguity.com",
         api_key: str | None = None,
@@ -44,7 +42,7 @@ def __init__(
 
 class AsyncApiClient(HttpxAsyncClient, BaseApiClient):
     def __init__(
-        self: AsyncApiClient,
+        self: "AsyncApiClient",
         *,
         base_url: str = "https://api.contiguity.com",
         api_key: str | None = None,

src/contiguity/_instant_messaging.py

@@ -1,15 +1,11 @@
-from __future__ import annotations
-
 import logging
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Generic, Literal, TypeVar
+from collections.abc import Sequence
+from typing import Generic, Literal, TypeVar
 
 from ._product import BaseProduct
 from ._response import BaseResponse, decode_response
 
-if TYPE_CHECKING:
-    from collections.abc import Sequence
-
 FallbackCauseT = TypeVar("FallbackCauseT", bound=str)
 
 logger = logging.getLogger(__name__)

src/contiguity/_response.py

@@ -1,10 +1,10 @@
 from collections.abc import Sequence
 from http import HTTPStatus
-from typing import Generic, TypeVar, Union
+from typing import Generic, TypeVar
 
 import msgspec
 
-T = TypeVar("T", bound=Union[msgspec.Struct, Sequence[msgspec.Struct]])
+T = TypeVar("T", bound=msgspec.Struct | Sequence[msgspec.Struct])
 
 
 class ResponseMetadata(msgspec.Struct):

src/contiguity/base/async_base.py

@@ -1,15 +1,14 @@
-from __future__ import annotations
-
 import json
 import os
 from collections.abc import Mapping, Sequence
 from datetime import datetime, timedelta, timezone
 from http import HTTPStatus
-from typing import TYPE_CHECKING, Generic, Literal, overload
+from typing import Generic, Literal, overload
 from warnings import warn
 
 import msgspec
 from httpx import HTTPStatusError
+from httpx import Response as HttpxResponse
 from typing_extensions import deprecated
 
 from contiguity._auth import get_data_key, get_project_id
@@ -31,18 +30,14 @@
 )
 from .exceptions import ItemConflictError, ItemNotFoundError
 
-if TYPE_CHECKING:
-    from httpx import Response as HttpxResponse
-    from typing_extensions import Self
-
 
 class AsyncBase(Generic[ItemT]):
     EXPIRES_ATTRIBUTE = "__expires"
     PUT_LIMIT = 30
 
     @overload
     def __init__(
-        self: Self,
+        self,
         name: str,
         /,
         *,
@@ -57,7 +52,7 @@ def __init__(
     @overload
     @deprecated("The `project_key` parameter has been renamed to `data_key`.")
     def __init__(
-        self: Self,
+        self,
         name: str,
         /,
         *,
@@ -70,7 +65,7 @@ def __init__(
     ) -> None: ...
 
     def __init__(  # noqa: PLR0913
-        self: Self,
+        self,
         name: str,
         /,
         *,
@@ -102,23 +97,23 @@ def __init__(  # noqa: PLR0913
 
     @overload
     def _response_as_item_type(
-        self: Self,
+        self,
         response: HttpxResponse,
         /,
         *,
         sequence: Literal[False] = False,
     ) -> ItemT: ...
     @overload
     def _response_as_item_type(
-        self: Self,
+        self,
         response: HttpxResponse,
         /,
         *,
         sequence: Literal[True] = True,
     ) -> Sequence[ItemT]: ...
 
     def _response_as_item_type(
-        self: Self,
+        self,
         response: HttpxResponse,
         /,
         *,
@@ -133,7 +128,7 @@ def _response_as_item_type(
         return response.json(cls=self.json_decoder)
 
     def _insert_expires_attr(
-        self: Self,
+        self,
         item: ItemT | Mapping[str, DataType],
         expire_in: int | None = None,
         expire_at: TimestampType | None = None,
@@ -158,16 +153,16 @@ def _insert_expires_attr(
         return item_dict
 
     @overload
-    async def get(self: Self, key: str, /) -> ItemT | None: ...
+    async def get(self, key: str, /) -> ItemT | None: ...
 
     @overload
-    async def get(self: Self, key: str, /, *, default: ItemT) -> ItemT: ...
+    async def get(self, key: str, /, *, default: ItemT) -> ItemT: ...
 
     @overload
-    async def get(self: Self, key: str, /, *, default: DefaultItemT) -> ItemT | DefaultItemT: ...
+    async def get(self, key: str, /, *, default: DefaultItemT) -> ItemT | DefaultItemT: ...
 
     async def get(
-        self: Self,
+        self,
         key: str,
         /,
         *,
@@ -187,7 +182,7 @@ async def get(
 
         return self._response_as_item_type(response, sequence=False)
 
-    async def delete(self: Self, key: str, /) -> None:
+    async def delete(self, key: str, /) -> None:
         """Delete an item from the Base."""
         key = check_key(key)
         response = await self._client.delete(f"/items/{key}")
@@ -197,7 +192,7 @@ async def delete(self: Self, key: str, /) -> None:
             raise ContiguityApiError(exc.response.text) from exc
 
     async def insert(
-        self: Self,
+        self,
         item: ItemT,
         /,
         *,
@@ -216,7 +211,7 @@ async def insert(
         return returned_item[0]
 
     async def put(
-        self: Self,
+        self,
         *items: ItemT,
         expire_in: int | None = None,
         expire_at: TimestampType | None = None,
@@ -237,7 +232,7 @@ async def put(
 
     @deprecated("This method will be removed in a future release. You can pass multiple items to `put`.")
     async def put_many(
-        self: Self,
+        self,
         items: Sequence[ItemT],
         /,
         *,
@@ -247,7 +242,7 @@ async def put_many(
         return await self.put(*items, expire_in=expire_in, expire_at=expire_at)
 
     async def update(
-        self: Self,
+        self,
         updates: Mapping[str, DataType | UpdateOperation],
         /,
         *,
@@ -278,7 +273,7 @@ async def update(
         return self._response_as_item_type(response, sequence=False)
 
     async def query(
-        self: Self,
+        self,
         *queries: QueryType,
         limit: int = 1000,
         last: str | None = None,
@@ -310,7 +305,7 @@ async def query(
 
     @deprecated("This method has been renamed to `query` and will be removed in a future release.")
     async def fetch(
-        self: Self,
+        self,
         *queries: QueryType,
         limit: int = 1000,
         last: str | None = None,