fix: Ruff linting

Author: fsbraun

djangocms_versioning/cms_toolbars.py

@@ -1,6 +1,7 @@
+from __future__ import annotations
+
 from collections import OrderedDict
 from copy import copy
-from typing import Optional
 
 from cms import __version__ as cms_version
 from cms.cms_toolbars import (
@@ -297,10 +298,10 @@ class VersioningPageToolbar(PageToolbar):
     """
 
     def __init__(self, *args, **kwargs):
-        self.page_content: Optional[PageContent] = None
+        self.page_content: PageContent | None = None
         super().__init__(*args, **kwargs)
 
-    def get_page_content(self, language: Optional[str] = None) -> PageContent:
+    def get_page_content(self, language: str | None = None) -> PageContent:
         # This method overwrites the method in django CMS core. Not necessary
         # for django CMS 4.2+
         if not language:

djangocms_versioning/datastructures.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 from collections.abc import Iterable
 from itertools import chain
-from typing import Any, Optional
+from typing import Any
 
 from cms.extensions.models import BaseExtension
 from cms.models import Placeholder, PlaceholderRelationField
@@ -16,7 +18,7 @@
 class BaseVersionableItem:
     concrete = False
 
-    def __init__(self, content_model: type[models.Model], content_admin_mixin: Optional[type] = None):
+    def __init__(self, content_model: type[models.Model], content_admin_mixin: type | None = None):
         self.content_model = content_model
         self.content_admin_mixin = content_admin_mixin or VersioningAdminMixin
 
@@ -29,15 +31,15 @@ def __init__(
         content_model: type[models.Model],
         grouper_field_name: str,
         copy_function: callable,
-        extra_grouping_fields: Optional[Iterable[str]] = None,
-        version_list_filter_lookups: Optional[dict[str, Any]] = None,
+        extra_grouping_fields: Iterable[str] | None = None,
+        version_list_filter_lookups: dict[str, Any] | None = None,
         on_publish=None,
         on_unpublish=None,
         on_draft_create=None,
         on_archive=None,
         grouper_selector_option_label=False,
-        grouper_admin_mixin: Optional[type] = None,
-        content_admin_mixin: Optional[type] = None,
+        grouper_admin_mixin: type | None = None,
+        content_admin_mixin: type | None = None,
         preview_url=None,
     ):
         super().__init__(content_model, content_admin_mixin)
@@ -161,7 +163,7 @@ def grouper_choices_queryset(self) -> models.QuerySet:
         cache_name = self.grouper_field.remote_field.get_accessor_name()
         return self.grouper_model._base_manager.prefetch_related(models.Prefetch(cache_name, queryset=content_objects))
 
-    def get_grouper_with_fallbacks(self, grouper_id) -> Optional[models.Model]:
+    def get_grouper_with_fallbacks(self, grouper_id) -> models.Model | None:
         return self.grouper_choices_queryset().filter(pk=grouper_id).first()
 
     def _get_content_types(self) -> set[int]:
@@ -193,7 +195,7 @@ class VersionableItemAlias(BaseVersionableItem):
     """
 
     def __init__(
-        self, content_model: type[models.Model], to: BaseVersionableItem, content_admin_mixin: Optional[type] = None
+        self, content_model: type[models.Model], to: BaseVersionableItem, content_admin_mixin: type | None = None
     ):
         super().__init__(content_model, content_admin_mixin)
         self.to = to

djangocms_versioning/helpers.py

@@ -1,8 +1,9 @@
+from __future__ import annotations
+
 import copy
 import warnings
 from collections.abc import Iterable
 from contextlib import contextmanager
-from typing import Optional
 
 from cms.models import Page, PageContent, Placeholder
 from cms.toolbar.utils import get_object_edit_url, get_object_preview_url
@@ -71,7 +72,7 @@ def _replace_admin_for_model(modeladmin: type[admin.ModelAdmin], mixin: type, ad
     admin_site.register(modeladmin.model, new_admin_class)
 
 
-def replace_admin_for_models(pairs: tuple[type[models.Model], type], admin_site: Optional[admin.AdminSite] = None):
+def replace_admin_for_models(pairs: tuple[type[models.Model], type], admin_site: admin.AdminSite | None = None):
     """
     :param models: List of (model class, admin mixin class) tuples
     :param admin_site: AdminSite instance
@@ -86,7 +87,7 @@ def replace_admin_for_models(pairs: tuple[type[models.Model], type], admin_site:
         _replace_admin_for_model(modeladmin, mixin, admin_site)
 
 
-def register_versionadmin_proxy(versionable, admin_site: Optional[admin.AdminSite] = None):
+def register_versionadmin_proxy(versionable, admin_site: admin.AdminSite | None = None):
     """Creates a model admin class based on `VersionAdmin` and registers
     it with `admin_site` for `versionable.version_model_proxy`.
 
@@ -281,7 +282,7 @@ def get_content_types_with_subclasses(models: Iterable[type[models.Model]], usin
 
 
 def get_preview_url(
-    content_obj: models.Model, language: Optional[str] = None
+    content_obj: models.Model, language: str | None = None
 ) -> str:
     """If the object is editable the cms preview view should be used, with the toolbar.
     This method provides the URL for it. It falls back the standard change view

djangocms_versioning/indicators.py

@@ -1,4 +1,4 @@
-import typing
+from __future__ import annotations
 
 from cms.utils.urlutils import admin_reverse
 from django.contrib.auth import get_permission_codename
@@ -92,8 +92,8 @@ def content_indicator_menu(request, status, versions, back=""):
 
 def content_indicator(
     content_obj: models.Model,
-    versions: typing.Optional[list[Version]] = None
-) -> typing.Optional[str]:
+    versions: list[Version] | None = None
+) -> str | None:
     """Translates available versions into status to be reflected by the indicator.
     Function caches the result in the page_content object"""