[django-filter] Various minor fixes

Author: intgr

stubs/django-filter/@tests/stubtest_allowlist.txt

@@ -8,12 +8,12 @@ django_filters.RemovedInDjangoFilter25Warning
 django_filters.fields.BaseCSVWidget.surrogate
 django_filters.fields.CSVWidget.__init__
 django_filters.fields.DJANGO_50
+django_filters.filters.__all__
 django_filters.filters.Filter.__init__
 django_filters.filters.NumberFilter.get_max_validator
 django_filters.filterset.BaseFilterSet.filter_for_field
 django_filters.filterset.FilterSet.base_filters
 django_filters.filterset.FilterSet.declared_filters
-django_filters.models
 django_filters.rest_framework.DjangoFilterBackend
 django_filters.rest_framework.Filter.__init__
 django_filters.rest_framework.FilterSet.base_filters

stubs/django-filter/django_filters/__init__.pyi

@@ -1,6 +1,5 @@
 from typing import Any
 
-from . import rest_framework as rest_framework
 from .filters import *
 from .filterset import FilterSet as FilterSet
 

stubs/django-filter/django_filters/fields.pyi

@@ -1,6 +1,7 @@
-from typing import Any
+from typing import Any, TypeVar
 
 from django import forms
+from django.db.models import Model
 
 from .conf import settings as settings
 from .constants import EMPTY_VALUES as EMPTY_VALUES
@@ -13,6 +14,8 @@ from .widgets import (
     RangeWidget as RangeWidget,
 )
 
+_M = TypeVar("_M", bound=Model)
+
 class RangeField(forms.MultiValueField):
     widget: Any = ...
     def __init__(self, fields: Any | None = ..., *args: Any, **kwargs: Any) -> None: ...
@@ -85,9 +88,9 @@ class MultipleChoiceField(ChoiceIteratorMixin, forms.MultipleChoiceField):
     empty_label: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
 
-class ModelChoiceField(ChoiceIteratorMixin, forms.ModelChoiceField):
+class ModelChoiceField(ChoiceIteratorMixin, forms.ModelChoiceField[_M]):
     iterator: Any = ...
     def to_python(self, value: Any): ...
 
-class ModelMultipleChoiceField(ChoiceIteratorMixin, forms.ModelMultipleChoiceField):
+class ModelMultipleChoiceField(ChoiceIteratorMixin, forms.ModelMultipleChoiceField[_M]):
     iterator: Any = ...

stubs/django-filter/django_filters/filters.pyi

@@ -1,4 +1,6 @@
-from typing import Any, Callable
+from _typeshed import Incomplete
+from collections.abc import Callable
+from typing import Any
 
 class Filter:
     creation_counter: int = ...
@@ -20,7 +22,7 @@ class Filter:
         **kwargs: Any,
     ) -> None: ...
     def get_method(self, qs: Any): ...
-    method: Callable = ...
+    method: Callable[..., Incomplete] = ...
     label: Any = ...
     @property
     def field(self): ...

stubs/django-filter/django_filters/models.pyi

@@ -1,3 +1,4 @@
+from _typeshed import Incomplete
 from typing import Any
 
 from django.views.generic import View
@@ -19,7 +20,7 @@ class FilterMixin(metaclass=FilterMixinRenames):
     def get_filterset_kwargs(self, filterset_class: Any): ...
     def get_strict(self): ...
 
-class BaseFilterView(FilterMixin, MultipleObjectMixin, View):
+class BaseFilterView(FilterMixin, MultipleObjectMixin[Incomplete], View):
     filterset: Any = ...
     object_list: Any = ...
     def get(self, request: Any, *args: Any, **kwargs: Any): ...

stubs/django-filter/django_filters/views.pyi

@@ -1,18 +1,25 @@
+from _typeshed import Incomplete
 from typing import Any
+from typing_extensions import TypeAlias
 
 from django import forms
 from django.forms.renderers import BaseRenderer
 from django.utils.safestring import SafeText
 
-_OptAttrs = dict[str, Any]
+_OptAttrs: TypeAlias = dict[str, Any]
 
 class LinkWidget(forms.Widget):
     choices: Any = ...
     def __init__(self, attrs: Any | None = ..., choices: Any = ...) -> None: ...
     data: Any = ...
     def value_from_datadict(self, data: Any, files: Any, name: Any): ...
     def render(  # type: ignore[override]
-        self, name: str, value: Any, attrs: _OptAttrs | None = ..., choices: tuple = ..., renderer: BaseRenderer | None = ...
+        self,
+        name: str,
+        value: Any,
+        attrs: _OptAttrs | None = ...,
+        choices: tuple[Incomplete, ...] = ...,
+        renderer: BaseRenderer | None = ...,
     ) -> SafeText: ...
     def render_options(self, choices: Any, selected_choices: Any, name: Any): ...
     def render_option(self, name: Any, selected_choices: Any, option_value: Any, option_label: Any): ...