Improve code cleaning for python 3.10+

Author: alorence

docs/index.rst

@@ -30,7 +30,7 @@ reworked authentication system, improved type annotations, and more flexible con
 Getting started
 ---------------
 
-.. important:: django-modern-rpc requires Python 3.10+ and Django 3.2+. If you need to install it in environment with
+.. important:: django-modern-rpc requires Python 3.10+ and Django 4.2+. If you need to install it in environment with
    older Python / Django versions, you must install a previous release. See :ref:`Changelog` for more information.
 
 Installing the library and configuring a Django project to use it can be achieved in a few minutes. Follow

modernrpc/auth.py

@@ -2,10 +2,12 @@
 
 import base64
 import functools
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
 from urllib.parse import unquote
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
+
     from django.http import HttpRequest
 
 

modernrpc/compat.py

@@ -1,14 +1,11 @@
 import sys
 import types
 import typing
-from types import NoneType  # noqa: F401
 
 import django
 from django.views.decorators.csrf import csrf_exempt
 
 if typing.TYPE_CHECKING:
-    from typing import TypeAlias  # noqa: F401
-
     if sys.version_info >= (3, 11):
         from typing import Self
     else:

modernrpc/core.py

@@ -4,7 +4,7 @@
 import logging
 from collections import OrderedDict, defaultdict
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Iterable
+from typing import TYPE_CHECKING, Any
 
 from asgiref.sync import async_to_sync, iscoroutinefunction, sync_to_async
 from django.utils.functional import cached_property
@@ -21,6 +21,8 @@
 from modernrpc.introspection import DocstringParser, Introspector
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from django.http import HttpRequest
 
     from modernrpc.handler import RpcHandler

modernrpc/helpers.py

@@ -2,13 +2,13 @@
 
 import datetime
 import xmlrpc.client
-from typing import TYPE_CHECKING, Any, Iterable, Sequence
+from typing import TYPE_CHECKING, Any
 
 from modernrpc.constants import NOT_SET
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Iterable, Sequence
     from enum import Flag
-    from typing import Callable
 
 
 def check_flags_compatibility(a: Flag, b: Flag) -> bool:

modernrpc/jsonrpc/backends/__init__.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Iterable, Protocol
+from typing import TYPE_CHECKING, Protocol
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
 
 

modernrpc/jsonrpc/backends/json.py

@@ -3,14 +3,16 @@
 import json
 from functools import cached_property
 from json import JSONDecodeError
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 
 from django.core.serializers.json import DjangoJSONEncoder
 from django.utils.module_loading import import_string
 
 from modernrpc.exceptions import RPCMarshallingError, RPCParseError
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
     from modernrpc.types import CustomKwargs, DictStrAny
 

modernrpc/jsonrpc/backends/marshalling.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from types import NoneType
 from typing import TYPE_CHECKING, cast, overload
 
 from modernrpc.constants import NOT_SET
@@ -30,7 +31,7 @@ def validate_dict_request(self, request_data: DictStrAny) -> None:
         # Notification request won't have "id" field
         # None is also an allowed value. Both cases are valid
         request_id = request_data.get("id")
-        if request_id is not None and type(request_id) not in (int, float, str):
+        if type(request_id) not in (NoneType, int, float, str):
             raise RPCInvalidRequest(
                 'Parameter "id" has an unsupported value. According to JSON-RPC 2.0 standard, it must '
                 f"be a String, a Number or a Null value. Found: {type(request_id)}"

modernrpc/jsonrpc/backends/orjson.py

@@ -1,14 +1,16 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 
 import orjson
 from django.utils.module_loading import import_string
 
 from modernrpc.exceptions import RPCMarshallingError, RPCParseError
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
     from modernrpc.types import CustomKwargs, DictStrAny
 

modernrpc/jsonrpc/backends/rapidjson.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from functools import cached_property
-from typing import TYPE_CHECKING, Iterable
+from typing import TYPE_CHECKING
 
 import rapidjson
 from django.utils.module_loading import import_string
@@ -10,6 +10,8 @@
 from modernrpc.exceptions import RPCMarshallingError, RPCParseError
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
     from modernrpc.jsonrpc.handler import JsonRpcRequest, JsonRpcResult
     from modernrpc.types import CustomKwargs, DictStrAny