Cleanup __future__.annotations imports

Author: alorence

modernrpc/auth.py

@@ -1,14 +1,9 @@
-from __future__ import annotations
-
 import base64
 import functools
-from typing import TYPE_CHECKING
+from collections.abc import Callable
 from urllib.parse import unquote
 
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from django.http import HttpRequest
+from django.http import HttpRequest
 
 
 def extract_header(request: HttpRequest, header_name: str) -> str:

modernrpc/compat.py

@@ -5,11 +5,10 @@
 import django
 from django.views.decorators.csrf import csrf_exempt
 
-if typing.TYPE_CHECKING:
-    if sys.version_info >= (3, 11):
-        from typing import Self
-    else:
-        from typing_extensions import Self  # noqa: F401
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self  # noqa: F401
 
 
 if django.VERSION >= (5, 0):

modernrpc/constants.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from enum import Flag, auto
 
 SYSTEM_NAMESPACE_DOTTED_PATH = "modernrpc.system_procedures.system"

modernrpc/core.py

@@ -1,33 +1,28 @@
-from __future__ import annotations
-
 import importlib
 import logging
 from collections import OrderedDict, defaultdict
+from collections.abc import Iterable
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
 
 from asgiref.sync import async_to_sync, iscoroutinefunction, sync_to_async
+from django.http import HttpRequest
 from django.utils.functional import cached_property
 
-from modernrpc import Protocol
 from modernrpc.compat import is_union_type, union_str_repr
 from modernrpc.config import settings
-from modernrpc.constants import NOT_SET
+from modernrpc.constants import NOT_SET, Protocol
 from modernrpc.exceptions import (
     AuthenticationError,
     RPCInvalidParams,
 )
 from modernrpc.helpers import check_flags_compatibility, ensure_sequence
 from modernrpc.introspection import DocstringParser, Introspector
+from modernrpc.types import AuthPredicateType, FuncOrCoro
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
-
-    from django.http import HttpRequest
-
     from modernrpc.handler import RpcHandler
     from modernrpc.server import RpcServer
-    from modernrpc.types import AuthPredicateType, FuncOrCoro
 
 logger = logging.getLogger(__name__)
 
@@ -48,10 +43,10 @@ class RpcRequestContext:
     :ivar auth_result: The result of authentication for this RPC context, if applicable.
     """
 
-    request: HttpRequest
-    server: RpcServer
-    handler: RpcHandler
-    protocol: Protocol
+    request: "HttpRequest"
+    server: "RpcServer"
+    handler: "RpcHandler"
+    protocol: "Protocol"
     auth_result: Any = None
 
 

modernrpc/handler.py

@@ -1,21 +1,14 @@
-from __future__ import annotations
-
 import logging
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Generic
+from http import HTTPStatus
+from typing import Any, ClassVar, Generic
+
+from django.http import HttpRequest
 
+from modernrpc import Protocol, RpcRequestContext
 from modernrpc.exceptions import RPCMethodNotFound
 from modernrpc.types import RequestType, RpcErrorResult, RpcSuccessResult
 
-if TYPE_CHECKING:
-    from http import HTTPStatus
-    from typing import Any, ClassVar
-
-    from django.http import HttpRequest
-
-    from modernrpc import Protocol, RpcRequestContext
-
-
 logger = logging.getLogger(__name__)
 
 

modernrpc/helpers.py

@@ -1,15 +1,11 @@
-from __future__ import annotations
-
 import datetime
 import xmlrpc.client
-from typing import TYPE_CHECKING, Any
+from collections.abc import Callable, Iterable, Sequence
+from enum import Flag
+from typing import Any
 
 from modernrpc.constants import NOT_SET
 
-if TYPE_CHECKING:
-    from collections.abc import Callable, Iterable, Sequence
-    from enum import Flag
-
 
 def check_flags_compatibility(a: Flag, b: Flag) -> bool:
     """Check that both flags are compatible"""

modernrpc/introspection.py

@@ -3,17 +3,13 @@
 - Signature
 """
 
-from __future__ import annotations
-
 import inspect
 import re
 import typing
-from typing import TYPE_CHECKING
 
 from django.utils.functional import cached_property
 
-if TYPE_CHECKING:
-    from modernrpc.types import FuncOrCoro
+from modernrpc.types import FuncOrCoro
 
 
 class Introspector:

modernrpc/jsonrpc/backends/__init__.py

@@ -1,11 +1,7 @@
-from __future__ import annotations
+from collections.abc import Iterable
+from typing import Protocol
 
-from typing import TYPE_CHECKING, Protocol
-
-if TYPE_CHECKING:
-    from collections.abc import Iterable
-
-    from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
+from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
 
 
 class JsonRpcDeserializer(Protocol):

modernrpc/jsonrpc/backends/json.py

@@ -1,6 +1,5 @@
-from __future__ import annotations
-
 import json
+from collections.abc import Iterable
 from functools import cached_property
 from json import JSONDecodeError
 from typing import TYPE_CHECKING
@@ -9,12 +8,11 @@
 from django.utils.module_loading import import_string
 
 from modernrpc.exceptions import RPCMarshallingError, RPCParseError
+from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
+from modernrpc.types import CustomKwargs
 
 if TYPE_CHECKING:
-    from collections.abc import Iterable
-
-    from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
-    from modernrpc.types import CustomKwargs, DictStrAny
+    from modernrpc.types import DictStrAny
 
 
 class PythonJsonDeserializer:

modernrpc/jsonrpc/backends/marshalling.py

@@ -1,16 +1,11 @@
-from __future__ import annotations
-
 from types import NoneType
-from typing import TYPE_CHECKING, cast, overload
+from typing import cast, overload
 
 from modernrpc.constants import NOT_SET
 from modernrpc.exceptions import RPCInvalidRequest
-from modernrpc.jsonrpc.handler import JsonRpcRequest
+from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
 from modernrpc.types import DictStrAny, RpcErrorResult
 
-if TYPE_CHECKING:
-    from modernrpc.jsonrpc.handler import JsonRpcResult
-
 
 class Unmarshaller:
     def __init__(self, validate_version: bool = True):