Avoided changing raw DeprecationWarning filter behavior

Refs #21188. Now pure Python DeprecationWarning visibility should
be back to Python defaults.

2 files changed, 7 insertions, 2 deletions

diff --git a/django/utils/deprecation.py b/django/utils/deprecation.py
index a4f928e73b..a9a1dcfbe2 100644
--- a/django/utils/deprecation.py
+++ b/django/utils/deprecation.py
@@ -10,6 +10,9 @@ class RemovedInDjango18Warning(DeprecationWarning):
     pass
 
 
+RemovedInNextVersionWarning = RemovedInDjango18Warning
+
+
 class warn_about_renamed_method(object):
     def __init__(self, class_name, old_method_name, new_method_name, deprecation_warning):
         self.class_name = class_name
diff --git a/django/utils/log.py b/django/utils/log.py
index f319704116..83ba15f52a 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -5,6 +5,7 @@ import warnings
 from django.conf import settings
 from django.core import mail
 from django.core.mail import get_connection
+from django.utils.deprecation import RemovedInNextVersionWarning
 from django.utils.module_loading import import_string
 from django.views.debug import ExceptionReporter, get_exception_reporter_filter
 
@@ -68,8 +69,9 @@ def configure_logging(logging_config, logging_settings):
     if not sys.warnoptions:
         # Route warnings through python logging
         logging.captureWarnings(True)
-        # Allow DeprecationWarnings through the warnings filters
-        warnings.simplefilter("default", DeprecationWarning)
+        # RemovedInNextVersionWarning is a subclass of DeprecationWarning which
+        # is hidden by default, hence we force the "default" behavior
+        warnings.simplefilter("default", RemovedInNextVersionWarning)
 
     if logging_config:
          # First find the logging configuration function ...