fix: ruff python 3.10 config (#1615)

Author: lukasvinclav

pyproject.toml

@@ -39,6 +39,7 @@ python-semantic-release = "^10.4"
 [tool.ruff]
 fix = true
 line-length = 88
+target-version = "py310"
 
 [tool.ruff.lint]
 select = [

src/unfold/admin.py

@@ -1,5 +1,5 @@
 from functools import update_wrapper
-from typing import Any, Optional
+from typing import Any
 
 from django import forms
 from django.contrib.admin import ModelAdmin as BaseModelAdmin
@@ -78,7 +78,7 @@ def media(self):
 
         for filter in self.get_list_filter(self.request):
             if (
-                isinstance(filter, (tuple, list))
+                isinstance(filter, tuple | list)
                 and hasattr(filter[1], "form_class")
                 and hasattr(filter[1].form_class, "Media")
             ):
@@ -89,7 +89,7 @@ def media(self):
         return media
 
     def changelist_view(
-        self, request: HttpRequest, extra_context: Optional[dict[str, str]] = None
+        self, request: HttpRequest, extra_context: dict[str, str] | None = None
     ) -> TemplateResponse:
         self.request = request
 
@@ -103,9 +103,9 @@ def changelist_view(
     def changeform_view(
         self,
         request: HttpRequest,
-        object_id: Optional[str] = None,
+        object_id: str | None = None,
         form_url: str = "",
-        extra_context: Optional[dict[str, Any]] = None,
+        extra_context: dict[str, Any] | None = None,
     ) -> TemplateResponse:
         self.request = request
         extra_context = extra_context or {}
@@ -142,7 +142,7 @@ def get_list_display(self, request: HttpRequest) -> list[str]:
         return list_display
 
     def get_fieldsets(
-        self, request: HttpRequest, obj: Optional[Model] = None
+        self, request: HttpRequest, obj: Model | None = None
     ) -> FieldsetsType:
         if not obj and self.add_fieldsets:
             return self.add_fieldsets
@@ -234,7 +234,7 @@ def response_change(self, request: HttpRequest, obj: Model) -> HttpResponse:
         return res
 
     def response_add(
-        self, request: HttpRequest, obj: Model, post_url_continue: Optional[str] = None
+        self, request: HttpRequest, obj: Model, post_url_continue: str | None = None
     ) -> HttpResponse:
         res = super().response_add(request, obj, post_url_continue)
         if "next" in request.GET:

src/unfold/components.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.http import HttpRequest
 
@@ -21,7 +21,7 @@ def register_class(cls, component_cls: type) -> None:
         cls._registry[class_name] = component_cls
 
     @classmethod
-    def get_class(cls, class_name: str) -> Optional[type]:
+    def get_class(cls, class_name: str) -> type | None:
         return cls._registry.get(class_name)
 
     @classmethod

src/unfold/contrib/filters/admin/mixins.py

@@ -1,5 +1,5 @@
 from collections.abc import Generator
-from typing import Any, Optional
+from typing import Any
 
 from django.contrib.admin.views.main import ChangeList
 from django.core.validators import EMPTY_VALUES
@@ -18,7 +18,7 @@
 
 
 class ValueMixin:
-    def value(self) -> Optional[str]:
+    def value(self) -> str | None:
         return (
             self.lookup_val[0]
             if self.lookup_val not in EMPTY_VALUES
@@ -29,7 +29,7 @@ def value(self) -> Optional[str]:
 
 
 class MultiValueMixin:
-    def value(self) -> Optional[list[str]]:
+    def value(self) -> list[str] | None:
         return (
             self.lookup_val
             if self.lookup_val not in EMPTY_VALUES

src/unfold/contrib/filters/admin/numeric_filters.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.contrib import admin
 from django.contrib.admin.options import ModelAdmin
@@ -35,7 +35,7 @@ def __init__(
     ) -> None:
         super().__init__(field, request, params, model, model_admin, field_path)
 
-        if not isinstance(field, (DecimalField, IntegerField, FloatField, AutoField)):
+        if not isinstance(field, DecimalField | IntegerField | FloatField | AutoField):
             raise TypeError(
                 f"Class {type(self.field)} is not supported for {self.__class__.__name__}."
             )
@@ -54,7 +54,7 @@ def __init__(
 
     def queryset(
         self, request: HttpRequest, queryset: QuerySet[Any]
-    ) -> Optional[QuerySet]:
+    ) -> QuerySet | None:
         if self.value():
             try:
                 return queryset.filter(**{self.parameter_name: self.value()})
@@ -64,7 +64,7 @@ def queryset(
     def value(self) -> Any:
         return self.used_parameters.get(self.parameter_name, None)
 
-    def expected_parameters(self) -> list[Optional[str]]:
+    def expected_parameters(self) -> list[str | None]:
         return [self.parameter_name]
 
     def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
@@ -111,7 +111,7 @@ def __init__(
         field_path: str,
     ) -> None:
         super().__init__(field, request, params, model, model_admin, field_path)
-        if not isinstance(field, (DecimalField, IntegerField, FloatField, AutoField)):
+        if not isinstance(field, DecimalField | IntegerField | FloatField | AutoField):
             raise TypeError(
                 f"Class {type(self.field)} is not supported for {self.__class__.__name__}."
             )
@@ -156,7 +156,7 @@ def choices(self, changelist: ChangeList) -> tuple[dict[str, Any], ...]:
         else:
             max_value = None
 
-        if isinstance(self.field, (FloatField, DecimalField)):
+        if isinstance(self.field, FloatField | DecimalField):
             decimals = self.MAX_DECIMALS
             step = self.STEP if self.STEP else self._get_min_step(self.MAX_DECIMALS)
         else:

src/unfold/contrib/forms/widgets.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional, Union
+from typing import Any
 
 from django.core.validators import EMPTY_VALUES
 from django.forms import MultiWidget, Widget
@@ -35,7 +35,7 @@ class ArrayWidget(MultiWidget):
 
     def __init__(
         self,
-        widget_class: Optional[type[Widget]] = None,
+        widget_class: type[Widget] | None = None,
         *args: Any,
         **kwargs: Any,
     ) -> None:
@@ -81,15 +81,15 @@ def value_omitted_from_data(
     ) -> list:
         return data.getlist(name) not in [[""], *EMPTY_VALUES]
 
-    def decompress(self, value: Union[str, list]) -> list:
+    def decompress(self, value: str | list) -> list:
         if isinstance(value, list):
             return value
         elif isinstance(value, str):
             return value.split(",")
 
         return []
 
-    def _resolve_widgets(self, value: Optional[Union[list, str]]) -> None:
+    def _resolve_widgets(self, value: list | str | None) -> None:
         if value is None:
             value = []
 
@@ -112,7 +112,7 @@ class Media:
             "unfold/forms/js/trix.config.js",
         )
 
-    def __init__(self, attrs: Optional[dict[str, Any]] = None) -> None:
+    def __init__(self, attrs: dict[str, Any] | None = None) -> None:
         super().__init__(attrs)
 
         self.attrs.update(

src/unfold/contrib/inlines/admin.py

@@ -1,5 +1,5 @@
 from functools import partial
-from typing import Any, Optional
+from typing import Any
 
 from django import forms
 from django.contrib.admin.utils import NestedObjects, flatten_fieldsets
@@ -28,7 +28,7 @@ class NonrelatedInlineMixin:
     formset = NonrelatedInlineModelFormSet
 
     def get_formset(
-        self, request: HttpRequest, obj: Optional[Model] = None, **kwargs: Any
+        self, request: HttpRequest, obj: Model | None = None, **kwargs: Any
     ):
         defaults = self._get_formset_defaults(request, obj, **kwargs)
 
@@ -41,7 +41,7 @@ def get_formset(
         )
 
     def _get_formset_defaults(
-        self, request: HttpRequest, obj: Optional[Model] = None, **kwargs: Any
+        self, request: HttpRequest, obj: Model | None = None, **kwargs: Any
     ):
         """Return a BaseInlineFormSet class for use in admin add/change views."""
         if "fields" in kwargs:

src/unfold/contrib/inlines/forms.py

@@ -1,4 +1,5 @@
-from typing import Any, Callable, Optional
+from collections.abc import Callable
+from typing import Any
 
 from django.db.models import Model, QuerySet
 from django.forms import BaseModelFormSet, ModelForm, modelformset_factory
@@ -9,7 +10,7 @@
 class NonrelatedInlineModelFormSet(PaginationFormSetMixin, BaseModelFormSet):
     def __init__(
         self,
-        instance: Optional[Model] = None,
+        instance: Model | None = None,
         save_as_new: bool = False,
         **kwargs: Any,
     ) -> None:
@@ -33,9 +34,9 @@ def save_new(self, form: ModelForm, commit: bool = True):
 
 def nonrelated_inline_formset_factory(
     model: Model,
-    queryset: Optional[QuerySet] = None,
+    queryset: QuerySet | None = None,
     formset: BaseModelFormSet = NonrelatedInlineModelFormSet,
-    save_new_instance: Optional[Callable] = None,
+    save_new_instance: Callable | None = None,
     **kwargs: Any,
 ) -> BaseModelFormSet:
     inline_formset = modelformset_factory(model, formset=formset, **kwargs)

src/unfold/dataclasses.py

@@ -1,5 +1,5 @@
+from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Callable, Optional, Union
 
 from unfold.enums import ActionVariant
 
@@ -12,31 +12,31 @@ class UnfoldAction:
     method: ActionFunction
     description: str
     path: str
-    attrs: Optional[dict] = None
-    object_id: Optional[Union[int, str]] = None
-    icon: Optional[str] = None
-    variant: Optional[ActionVariant] = ActionVariant.DEFAULT
+    attrs: dict | None = None
+    object_id: int | str | None = None
+    icon: str | None = None
+    variant: ActionVariant | None = ActionVariant.DEFAULT
 
 
 @dataclass
 class SearchResult:
     title: str
     description: str
     link: str
-    icon: Optional[str]
+    icon: str | None
 
 
 @dataclass
 class Favicon:
-    href: Union[str, Callable]
-    rel: Optional[str] = None
-    type: Optional[str] = None
-    sizes: Optional[str] = None
+    href: str | Callable
+    rel: str | None = None
+    type: str | None = None
+    sizes: str | None = None
 
 
 @dataclass
 class DropdownItem:
     title: str
-    link: Union[str, Callable]
-    icon: Optional[str] = None
-    attrs: Optional[dict] = None
+    link: str | Callable
+    icon: str | None = None
+    attrs: dict | None = None

src/unfold/datasets.py

@@ -1,4 +1,4 @@
-from typing import Any, Optional
+from typing import Any
 
 from django.contrib import admin
 from django.http import HttpRequest
@@ -11,7 +11,7 @@ class BaseDataset:
     tab = False
 
     def __init__(
-        self, request: HttpRequest, extra_context: Optional[dict[str, Any]]
+        self, request: HttpRequest, extra_context: dict[str, Any] | None
     ) -> None:
         self.request = request
         self.extra_context = extra_context