[pull] main from django:main

docs/internals/deprecation.txt

@@ -15,6 +15,8 @@ about each item can often be found in the release notes of two versions prior.
 See the :ref:`Django 6.2 release notes <deprecated-features-6.2>` for more
 details on these changes.
 
+* The ``safe`` parameter of :class:`~django.http.JsonResponse` will be removed.
+
 .. _deprecation-removed-in-7.0:
 
 7.0
@@ -36,9 +38,6 @@ details on these changes.
 
 * The ``URLIZE_ASSUME_HTTPS`` transitional setting will be removed.
 
-* The ``SIGNED_COOKIE_LEGACY_SALT_FALLBACK`` transitional setting will be
-  removed.
-
 * Using a percent sign in a column alias or annotation will raise
   ``ValueError``.
 
@@ -79,6 +78,9 @@ details on these changes.
 
 * The ``USE_BLANK_CHOICE_DASH`` transitional setting will be removed.
 
+* The ``SIGNED_COOKIE_LEGACY_SALT_FALLBACK`` transitional setting will be
+  removed.
+
 * The ``Field.get_placeholder_sql`` shim over the deprecated
   ``get_placeholder`` method will be removed.
 
@@ -118,6 +120,9 @@ details on these changes.
   ``django.core.signing.base64_hmac()`` will change from ``"sha1"`` to
   ``"sha256"``.
 
+* Calling :meth:`.QuerySet.select_related` without arguments will raise
+  :exc:`TypeError`.
+
 * :meth:`.QuerySet.select_related` will raise :exc:`TypeError` if passed
   ``True`` rather than :exc:`AttributeError`.
 

tests/deprecation/test_middleware_mixin.py

@@ -1,6 +1,7 @@
 import threading
+from inspect import iscoroutinefunction
 
-from asgiref.sync import async_to_sync, iscoroutinefunction
+from asgiref.sync import async_to_sync
 
 from django.contrib.admindocs.middleware import XViewMiddleware
 from django.contrib.auth.middleware import (

tests/view_tests/tests/test_debug.py

@@ -5,11 +5,12 @@
 import sys
 import tempfile
 import threading
+from inspect import iscoroutinefunction
 from io import StringIO
 from pathlib import Path
 from unittest import mock, skipIf
 
-from asgiref.sync import async_to_sync, iscoroutinefunction
+from asgiref.sync import async_to_sync
 
 from django.core import mail
 from django.core.files.uploadedfile import SimpleUploadedFile