summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-09-20 21:03:24 +0200
committerClaude Paroz <claude@2xlibre.net>2012-09-20 21:03:24 +0200
commit26ff2be787d3c1fad2df4a009fa05b4c11b8cf30 (patch)
treed25289de0e959ab556dd8704beb6daa2e35d8a8b /tests
parent89136b2725db3cb774ae4b39849684ae8f3847aa (diff)
Imported getLogger directly from logging module
This was a remainder of some 2.4 compatibility code.
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/logging_tests/tests.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/regressiontests/logging_tests/tests.py b/tests/regressiontests/logging_tests/tests.py
index 4ae3c1b1a9..f444e0ff46 100644
--- a/tests/regressiontests/logging_tests/tests.py
+++ b/tests/regressiontests/logging_tests/tests.py
@@ -1,13 +1,14 @@
from __future__ import unicode_literals
import copy
+import logging
import warnings
from django.conf import compat_patch_logging_config
from django.core import mail
from django.test import TestCase, RequestFactory
from django.test.utils import override_settings
-from django.utils.log import CallbackFilter, RequireDebugFalse, getLogger
+from django.utils.log import CallbackFilter, RequireDebugFalse
# logging config prior to using filter with mail_admins
@@ -153,7 +154,7 @@ class AdminEmailHandlerTest(TestCase):
token1 = 'ping'
token2 = 'pong'
- logger = getLogger('django.request')
+ logger = logging.getLogger('django.request')
admin_email_handler = self.get_admin_email_handler(logger)
# Backup then override original filters
orig_filters = admin_email_handler.filters
@@ -184,7 +185,7 @@ class AdminEmailHandlerTest(TestCase):
token1 = 'ping'
token2 = 'pong'
- logger = getLogger('django.request')
+ logger = logging.getLogger('django.request')
admin_email_handler = self.get_admin_email_handler(logger)
# Backup then override original filters
orig_filters = admin_email_handler.filters
@@ -222,7 +223,7 @@ class AdminEmailHandlerTest(TestCase):
self.assertEqual(len(mail.outbox), 0)
- logger = getLogger('django.request')
+ logger = logging.getLogger('django.request')
logger.error(message)
self.assertEqual(len(mail.outbox), 1)
@@ -247,7 +248,7 @@ class AdminEmailHandlerTest(TestCase):
self.assertEqual(len(mail.outbox), 0)
- logger = getLogger('django.request')
+ logger = logging.getLogger('django.request')
logger.error(message)
self.assertEqual(len(mail.outbox), 1)