Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Relied on NullHandler from the logging stdlib module.

  • Loading branch information...
commit 6c66a41c3dc697dc3bda4e31e8b05084d2ede915 1 parent 6a0374d
@aaugustin aaugustin authored
Showing with 4 additions and 12 deletions.
  1. +3 −11 django/utils/log.py
  2. +1 −1  docs/topics/logging.txt
View
14 django/utils/log.py
@@ -6,16 +6,8 @@
from django.core.mail import get_connection
from django.views.debug import ExceptionReporter, get_exception_reporter_filter
-
-# Make sure a NullHandler is available
-# This was added in Python 2.7/3.2
-try:
- from logging import NullHandler
-except ImportError:
- class NullHandler(logging.Handler):
- def emit(self, record):
- pass
-
+# Imports kept for backwards-compatibility in Django 1.7.
+from logging import NullHandler
from logging.config import dictConfig
getLogger = logging.getLogger
@@ -41,7 +33,7 @@ def emit(self, record):
'class': 'logging.StreamHandler',
},
'null': {
- 'class': 'django.utils.log.NullHandler',
+ 'class': 'logging.NullHandler',
},
'mail_admins': {
'level': 'ERROR',
View
2  docs/topics/logging.txt
@@ -255,7 +255,7 @@ complex logging setup, configured using :func:`logging.config.dictConfig`::
'handlers': {
'null': {
'level': 'DEBUG',
- 'class': 'django.utils.log.NullHandler',
+ 'class': 'logging.NullHandler',
},
'console':{
'level': 'DEBUG',
Please sign in to comment.
Something went wrong with that request. Please try again.