diff options
| -rw-r--r-- | django/utils/deprecation.py | 7 | ||||
| -rw-r--r-- | docs/internals/deprecation.txt | 8 | ||||
| -rwxr-xr-x | tests/runtests.py | 5 |
3 files changed, 17 insertions, 3 deletions
diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py index 1cb1df105c..8c7dd050fb 100644 --- a/django/utils/deprecation.py +++ b/django/utils/deprecation.py @@ -2,14 +2,17 @@ import inspect import warnings -class RemovedInDjango30Warning(PendingDeprecationWarning): +class RemovedInDjango30Warning(DeprecationWarning): pass -class RemovedInNextVersionWarning(DeprecationWarning): +class RemovedInDjango31Warning(PendingDeprecationWarning): pass +RemovedInNextVersionWarning = RemovedInDjango30Warning + + class warn_about_renamed_method: def __init__(self, class_name, old_method_name, new_method_name, deprecation_warning): self.class_name = class_name diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt index 99a16f50fd..3a72ea43ca 100644 --- a/docs/internals/deprecation.txt +++ b/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 about each item can often be found in the release notes of two versions prior. +.. _deprecation-removed-in-3.1: + +3.1 +--- + +See the :ref:`Django 2.2 release notes <deprecated-features-2.2>` for more +details on these changes. + .. _deprecation-removed-in-3.0: 3.0 diff --git a/tests/runtests.py b/tests/runtests.py index b1baf8d31e..9d67a15a94 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -17,7 +17,9 @@ from django.test import TestCase, TransactionTestCase from django.test.runner import default_test_processes from django.test.selenium import SeleniumTestCaseBase from django.test.utils import get_runner -from django.utils.deprecation import RemovedInDjango30Warning +from django.utils.deprecation import ( + RemovedInDjango30Warning, RemovedInDjango31Warning, +) from django.utils.log import DEFAULT_LOGGING try: @@ -30,6 +32,7 @@ else: # Make deprecation warnings errors to ensure no usage of deprecated features. warnings.simplefilter("error", RemovedInDjango30Warning) +warnings.simplefilter('error', RemovedInDjango31Warning) # Make runtime warning errors to ensure no usage of error prone patterns. warnings.simplefilter("error", RuntimeWarning) # Ignore known warnings in test dependencies. |