🚨 Update to modern syntax using 'ruff check --fix'

Author: sergei-maertens

mozilla_django_oidc_db/backends.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, cast
+from typing import Any, cast, override
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import (
@@ -14,7 +14,6 @@
 
 import requests
 from mozilla_django_oidc.auth import OIDCAuthenticationBackend as BaseBackend
-from typing_extensions import override
 
 from .config import dynamic_setting, lookup_config
 from .exceptions import MissingInitialisation

mozilla_django_oidc_db/config.py

@@ -6,15 +6,15 @@
 settings that are still defined in the django settings layer.
 """
 
-from typing import Any, Generic, Protocol, TypeVar, overload
+from typing import Any, Generic, Protocol, Self, TypeVar, Unpack, overload
 
 from django.core.exceptions import (
     BadRequest,
 )
 from django.http import HttpRequest
 
 from mozilla_django_oidc.utils import import_from_settings
-from typing_extensions import Self, TypedDict, Unpack
+from typing_extensions import TypedDict
 
 from .constants import CONFIG_IDENTIFIER_SESSION_KEY
 from .models import OIDCClient
@@ -74,7 +74,7 @@ class DynamicSettingKwargs(TypedDict, Generic[T], total=False):
     default: T
 
 
-class dynamic_setting(Generic[T]):
+class dynamic_setting[T]:
     """
     Descriptor to lazily access settings while explicitly defining them.
 

mozilla_django_oidc_db/middleware.py

@@ -1,9 +1,8 @@
-from typing import Any
+from typing import Any, override
 
 from django.urls import reverse
 
 from mozilla_django_oidc.middleware import SessionRefresh as BaseSessionRefresh
-from typing_extensions import override
 
 from .config import (
     BadRequest,

mozilla_django_oidc_db/plugins.py

@@ -2,7 +2,7 @@
 
 import logging
 from abc import abstractmethod
-from typing import Any, Protocol, TypeAlias, runtime_checkable
+from typing import Any, Protocol, runtime_checkable
 
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import AbstractUser, AnonymousUser
@@ -109,7 +109,7 @@ def verify_claims(self, claims: JSONObject) -> bool:
         ...
 
 
-OIDCPlugin: TypeAlias = AbstractUserOIDCPluginProtocol | AnonymousUserOIDCPluginProtocol
+type OIDCPlugin = AbstractUserOIDCPluginProtocol | AnonymousUserOIDCPluginProtocol
 
 
 admin_callback_view = AdminCallbackView.as_view()

mozilla_django_oidc_db/typing.py

@@ -1,15 +1,15 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
-from typing import Protocol, TypeAlias
+from collections.abc import MutableMapping, Sequence
+from typing import Protocol
 
 from django.http import HttpRequest, HttpResponseBase
 
-JSONPrimitive: TypeAlias = str | int | float | bool | None
-JSONValue: TypeAlias = "JSONPrimitive | list[JSONValue] | JSONObject"
-JSONObject: TypeAlias = dict[str, JSONValue]
+type JSONPrimitive = str | int | float | bool | None
+type JSONValue = JSONPrimitive | list[JSONValue] | JSONObject
+type JSONObject = MutableMapping[str, JSONValue]
 
-ClaimPath: TypeAlias = Sequence[str]
+type ClaimPath = Sequence[str]
 
 
 class DjangoView(Protocol):