diff --git a/django/utils/log.py b/django/utils/log.py index cb33378c071..f1af7a249e3 100644 --- a/django/utils/log.py +++ b/django/utils/log.py @@ -6,16 +6,8 @@ from django.core import mail 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 @@ DEFAULT_LOGGING = { 'class': 'logging.StreamHandler', }, 'null': { - 'class': 'django.utils.log.NullHandler', + 'class': 'logging.NullHandler', }, 'mail_admins': { 'level': 'ERROR', diff --git a/docs/topics/logging.txt b/docs/topics/logging.txt index e2e68a61a1a..66c517d6151 100644 --- a/docs/topics/logging.txt +++ b/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',