5.0: Update django.utils (#2006)

Excludes `django.utils.choices` as handling all issues related to
choices together makes more sense than trying to combine it here.

django-stubs/utils/deprecation.pyi

@@ -5,11 +5,11 @@ from django.http.request import HttpRequest
 from django.http.response import HttpResponseBase
 from typing_extensions import TypeAlias
 
-class RemovedInDjango50Warning(DeprecationWarning): ...
-class RemovedInDjango51Warning(PendingDeprecationWarning): ...
+class RemovedInDjango51Warning(DeprecationWarning): ...
+class RemovedInDjango60Warning(PendingDeprecationWarning): ...
 
-RemovedInNextVersionWarning: TypeAlias = RemovedInDjango50Warning
-RemovedAfterNextVersionWarning: TypeAlias = RemovedInDjango51Warning
+RemovedInNextVersionWarning: TypeAlias = RemovedInDjango51Warning
+RemovedAfterNextVersionWarning: TypeAlias = RemovedInDjango60Warning
 
 class warn_about_renamed_method:
     class_name: str

django-stubs/utils/html.pyi

@@ -8,6 +8,8 @@ from _typeshed import Incomplete
 from django.utils.functional import SimpleLazyObject, _StrOrPromise
 from django.utils.safestring import SafeData, SafeString
 
+VOID_ELEMENTS: set[str]
+
 def escape(text: Any) -> SafeString: ...
 def escapejs(value: Any) -> SafeString: ...
 def json_script(value: Any, element_id: str | None = ..., encoder: type[JSONEncoder] | None = ...) -> SafeString: ...

django-stubs/utils/text.pyi

@@ -30,11 +30,11 @@ re_newlines: Pattern[str]
 re_camel_case: Pattern[str]
 
 def wrap(text: _StrOrPromiseT, width: int) -> _StrOrPromiseT: ...
+def add_truncation_text(text: str, truncate: str | None = ...) -> str: ...
 
 class Truncator(SimpleLazyObject):
     MAX_LENGTH_HTML: ClassVar[int]
     def __init__(self, text: Model | str) -> None: ...
-    def add_truncation_text(self, text: str, truncate: str | None = ...) -> str: ...
     def chars(self, num: int, truncate: str | None = ..., html: bool = ...) -> str: ...
     def words(self, num: int, truncate: str | None = ..., html: bool = ...) -> str: ...
 

django-stubs/utils/timezone.pyi

@@ -1,12 +1,10 @@
 from contextlib import ContextDecorator
 from datetime import date, datetime, time, timedelta, timezone, tzinfo
 from types import TracebackType
-from typing import Any, Literal, overload
+from typing import Literal, overload
 
 import zoneinfo
 
-utc: Any
-
 def get_fixed_timezone(offset: timedelta | int) -> timezone: ...
 def get_default_timezone() -> zoneinfo.ZoneInfo: ...
 def get_default_timezone_name() -> str: ...
@@ -38,5 +36,5 @@ def is_aware(value: datetime) -> bool: ...
 def is_naive(value: time) -> Literal[True]: ...
 @overload
 def is_naive(value: datetime) -> bool: ...
-def make_aware(value: datetime, timezone: tzinfo | None = ..., is_dst: bool | None = ...) -> datetime: ...
+def make_aware(value: datetime, timezone: tzinfo | None = ...) -> datetime: ...
 def make_naive(value: datetime, timezone: tzinfo | None = ...) -> datetime: ...

scripts/stubtest/allowlist_todo_django50.txt

@@ -223,11 +223,3 @@ django.template.autoreload
 django.template.base.Template.__iter__
 django.template.defaultfilters.escapeseq
 django.utils.choices
-django.utils.deprecation.RemovedInDjango50Warning
-django.utils.deprecation.RemovedInDjango60Warning
-django.utils.html.VOID_ELEMENTS
-django.utils.text.Truncator.add_truncation_text
-django.utils.text.add_truncation_text
-django.utils.timezone.make_aware
-django.utils.timezone.utc
-django.utils.topological_sort