2
0
Эх сурвалжийг харах

Advanced deprecation warnings for Django 6.0.

Sarah Boyce 3 сар өмнө
parent
commit
7bc88c3c15

+ 4 - 4
django/utils/deprecation.py

@@ -4,16 +4,16 @@ import warnings
 from asgiref.sync import iscoroutinefunction, markcoroutinefunction, sync_to_async
 from asgiref.sync import iscoroutinefunction, markcoroutinefunction, sync_to_async
 
 
 
 
-class RemovedInDjango60Warning(DeprecationWarning):
+class RemovedInDjango61Warning(DeprecationWarning):
     pass
     pass
 
 
 
 
-class RemovedInDjango61Warning(PendingDeprecationWarning):
+class RemovedInDjango70Warning(PendingDeprecationWarning):
     pass
     pass
 
 
 
 
-RemovedInNextVersionWarning = RemovedInDjango60Warning
-RemovedAfterNextVersionWarning = RemovedInDjango61Warning
+RemovedInNextVersionWarning = RemovedInDjango61Warning
+RemovedAfterNextVersionWarning = RemovedInDjango70Warning
 
 
 
 
 class warn_about_renamed_method:
 class warn_about_renamed_method:

+ 8 - 0
docs/internals/deprecation.txt

@@ -7,6 +7,14 @@ in a backward incompatible way, following their deprecation, as per the
 :ref:`deprecation policy <internal-release-deprecation-policy>`. More details
 :ref:`deprecation policy <internal-release-deprecation-policy>`. More details
 about each item can often be found in the release notes of two versions prior.
 about each item can often be found in the release notes of two versions prior.
 
 
+.. _deprecation-removed-in-7.0:
+
+7.0
+---
+
+See the :ref:`Django 6.0 release notes <deprecated-features-6.0>` for more
+details on these changes.
+
 .. _deprecation-removed-in-6.1:
 .. _deprecation-removed-in-6.1:
 
 
 6.1
 6.1

+ 2 - 2
tests/runtests.py

@@ -29,8 +29,8 @@ else:
     from django.test.selenium import SeleniumTestCase, SeleniumTestCaseBase
     from django.test.selenium import SeleniumTestCase, SeleniumTestCaseBase
     from django.test.utils import NullTimeKeeper, TimeKeeper, get_runner
     from django.test.utils import NullTimeKeeper, TimeKeeper, get_runner
     from django.utils.deprecation import (
     from django.utils.deprecation import (
-        RemovedInDjango60Warning,
         RemovedInDjango61Warning,
         RemovedInDjango61Warning,
+        RemovedInDjango70Warning,
     )
     )
     from django.utils.functional import classproperty
     from django.utils.functional import classproperty
     from django.utils.log import DEFAULT_LOGGING
     from django.utils.log import DEFAULT_LOGGING
@@ -46,7 +46,7 @@ else:
     warnings.filterwarnings("ignore", r"\(1003, *", category=MySQLdb.Warning)
     warnings.filterwarnings("ignore", r"\(1003, *", category=MySQLdb.Warning)
 
 
 # Make deprecation warnings errors to ensure no usage of deprecated features.
 # Make deprecation warnings errors to ensure no usage of deprecated features.
-warnings.simplefilter("error", RemovedInDjango60Warning)
+warnings.simplefilter("error", RemovedInDjango70Warning)
 warnings.simplefilter("error", RemovedInDjango61Warning)
 warnings.simplefilter("error", RemovedInDjango61Warning)
 # Make resource and runtime warning errors to ensure no usage of error prone
 # Make resource and runtime warning errors to ensure no usage of error prone
 # patterns.
 # patterns.