summaryrefslogtreecommitdiff
path: root/django/utils/log.py
diff options
context:
space:
mode:
Diffstat (limited to 'django/utils/log.py')
-rw-r--r--django/utils/log.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/django/utils/log.py b/django/utils/log.py
index cb33378c07..f1af7a249e 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',