Add StepValueValidator, fix argument for SRIDCacheEntry/EmailValidator, improve urls.resolvers types (#1589)

* fix: wrong argument order for SRIDCacheEntry

* fix: remove legacy arguments for EmailValidator

* feat: add missing validator

* fix: misc urls.resolvers types

* chore: update allowlist-todo

Author: GabDug

django-stubs/contrib/gis/db/models/fields.pyi

@@ -25,8 +25,8 @@ _GT = TypeVar("_GT")
 class SRIDCacheEntry(NamedTuple):
     units: Any
     units_name: str
-    geodetic: bool
     spheroid: str
+    geodetic: bool
 
 def get_srid_info(srid: int, connection: Any) -> SRIDCacheEntry: ...
 

django-stubs/core/validators.pyi

@@ -57,13 +57,7 @@ class EmailValidator:
         message: _StrOrPromise | None = ...,
         code: str | None = ...,
         allowlist: Sequence[str] | None = ...,
-        *,
-        whitelist: Sequence[str] | None = ...,
     ) -> None: ...
-    @property
-    def domain_whitelist(self) -> Sequence[str]: ...
-    @domain_whitelist.setter
-    def domain_whitelist(self, allowlist: Sequence[str]) -> None: ...
     def __call__(self, value: str | None) -> None: ...
     def validate_domain_part(self, domain_part: str) -> bool: ...
     def __eq__(self, other: object) -> bool: ...
@@ -100,6 +94,7 @@ class BaseValidator:
 
 class MaxValueValidator(BaseValidator): ...
 class MinValueValidator(BaseValidator): ...
+class StepValueValidator(BaseValidator): ...
 
 class MinLengthValidator(BaseValidator):
     def clean(self, x: Sized) -> int: ...

django-stubs/urls/resolvers.pyi

@@ -7,6 +7,7 @@ from django.core.checks.messages import CheckMessage
 from django.urls import _AnyURL
 from django.urls.converters import UUIDConverter
 from django.utils.datastructures import MultiValueDict
+from django.utils.functional import cached_property
 from typing_extensions import TypeAlias
 
 class ResolverMatch:
@@ -32,6 +33,8 @@ class ResolverMatch:
         namespaces: list[str | None] | None = ...,
         route: str | None = ...,
         tried: Any | None = ...,
+        captured_kwargs: dict[str, Any] | None = ...,
+        extra_kwargs: dict[str, Any] | None = ...,
     ) -> None: ...
     def __getitem__(self, index: int) -> Any: ...
     # for tuple unpacking
@@ -95,7 +98,7 @@ class URLPattern:
     ) -> None: ...
     def check(self) -> list[CheckMessage]: ...
     def resolve(self, path: str) -> ResolverMatch | None: ...
-    @property
+    @cached_property
     def lookup_str(self) -> str: ...
 
 class URLResolver:
@@ -121,12 +124,13 @@ class URLResolver:
     def namespace_dict(self) -> dict[str, tuple[str, URLResolver]]: ...
     @property
     def app_dict(self) -> dict[str, list[str]]: ...
-    @property
+    @cached_property
     def urlconf_module(self) -> ModuleType | None | Sequence[_AnyURL]: ...
-    @property
+    @cached_property
     def url_patterns(self) -> list[_AnyURL]: ...
     def resolve(self, path: str) -> ResolverMatch: ...
     def resolve_error_handler(self, view_type: int) -> Callable: ...
     def reverse(self, lookup_view: str, *args: Any, **kwargs: Any) -> str: ...
     def _is_callback(self, name: str) -> bool: ...
     def _populate(self) -> None: ...
+    def check(self) -> list[CheckMessage]: ...

scripts/stubtest/allowlist_todo.txt

@@ -496,8 +496,6 @@ django.contrib.gis.db.models.aggregates.GeoAggregate.output_field
 django.contrib.gis.db.models.fields.BaseSpatialField.class_lookups
 django.contrib.gis.db.models.fields.GeometryField.contribute_to_class
 django.contrib.gis.db.models.fields.RasterField.contribute_to_class
-django.contrib.gis.db.models.fields.SRIDCacheEntry.__match_args__
-django.contrib.gis.db.models.fields.SRIDCacheEntry.__new__
 django.contrib.gis.db.models.functions.Area.as_sql
 django.contrib.gis.db.models.functions.GeoFuncMixin.__init__
 django.contrib.gis.db.models.functions.GeoFuncMixin.as_sql
@@ -982,11 +980,9 @@ django.core.validators.BaseValidator.__new__
 django.core.validators.BaseValidator.deconstruct
 django.core.validators.DecimalValidator.__new__
 django.core.validators.DecimalValidator.deconstruct
-django.core.validators.EmailValidator.__init__
 django.core.validators.EmailValidator.__new__
 django.core.validators.EmailValidator.deconstruct
 django.core.validators.EmailValidator.domain_regex
-django.core.validators.EmailValidator.domain_whitelist
 django.core.validators.EmailValidator.literal_regex
 django.core.validators.EmailValidator.user_regex
 django.core.validators.FileExtensionValidator.__new__
@@ -1003,7 +999,8 @@ django.core.validators.ProhibitNullCharactersValidator.__new__
 django.core.validators.ProhibitNullCharactersValidator.deconstruct
 django.core.validators.RegexValidator.__new__
 django.core.validators.RegexValidator.deconstruct
-django.core.validators.StepValueValidator
+django.core.validators.StepValueValidator.__new__
+django.core.validators.StepValueValidator.deconstruct
 django.core.validators.URLValidator.__new__
 django.core.validators.URLValidator.deconstruct
 django.core.validators.URLValidator.regex
@@ -2405,20 +2402,10 @@ django.test.testcases._AssertTemplateUsedContext.message
 django.test.utils.TimeKeeperProtocol
 django.test.utils.override_settings.enable_exception
 django.test.utils.setup_databases
-django.urls.ResolverMatch.__init__
 django.urls.ResolverMatch.__iter__
-django.urls.URLPattern.lookup_str
-django.urls.URLResolver.check
-django.urls.URLResolver.url_patterns
-django.urls.URLResolver.urlconf_module
 django.urls.conf.path
 django.urls.conf.re_path
 django.urls.path
 django.urls.re_path
 django.urls.resolvers.LocaleRegexDescriptor.__get__
-django.urls.resolvers.ResolverMatch.__init__
 django.urls.resolvers.ResolverMatch.__iter__
-django.urls.resolvers.URLPattern.lookup_str
-django.urls.resolvers.URLResolver.check
-django.urls.resolvers.URLResolver.url_patterns
-django.urls.resolvers.URLResolver.urlconf_module