Ticket #18985: 18985-2.diff

django/conf/__init__.py

@@ -6 +6 @@
 a list of all possible variables.
 """
 
+import logging
 import os
 import time     # Needed for Windows
 import warnings
@@ -54 +55 @@
         """
         Setup logging from LOGGING_CONFIG and LOGGING settings.
         """
+        try:
+            logging.captureWarnings(True)
+            warnings.simplefilter("default", DeprecationWarning)
+        except AttributeError:
+            # No captureWarnings on Python 2.6, DeprecationWarnings are on anyway
+            pass
+
         if self.LOGGING_CONFIG:
             from django.utils.log import DEFAULT_LOGGING
             # First find the logging configuration function ...

django/utils/log.py

@@ -62 +62 @@
             'level': 'ERROR',
             'propagate': False,
         },
+        'py.warnings': {
+            'handlers': ['console'],
+        },
     }
 }