diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-07-01 23:14:44 +0200 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-07-01 23:16:25 +0200 |
| commit | 6c66a41c3dc697dc3bda4e31e8b05084d2ede915 (patch) | |
| tree | 72ee1b7c0576e90cdabbdcc5fa0024af831748e6 /django/utils/log.py | |
| parent | 6a0374d03705b04872ac72af2be92aedbf0c213f (diff) | |
Relied on NullHandler from the logging stdlib module.
Diffstat (limited to 'django/utils/log.py')
| -rw-r--r-- | django/utils/log.py | 14 |
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', |
