Imported getLogger directly from logging module

This was a remainder of some 2.4 compatibility code.

9 files changed, 25 insertions, 21 deletions

diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index 791382bac0..ba6e8f0be7 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import logging
 import sys
 import types
 
@@ -7,10 +8,9 @@ from django import http
 from django.core import signals
 from django.utils.encoding import force_text
 from django.utils.importlib import import_module
-from django.utils.log import getLogger
 from django.utils import six
 
-logger = getLogger('django.request')
+logger = logging.getLogger('django.request')
 
 
 class BaseHandler(object):
diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py
index 7a32a3dac7..7d2ee44e80 100644
--- a/django/core/handlers/wsgi.py
+++ b/django/core/handlers/wsgi.py
@@ -1,5 +1,6 @@
 from __future__ import unicode_literals
 
+import logging
 import sys
 from io import BytesIO
 from threading import Lock
@@ -10,9 +11,8 @@ from django.core.handlers import base
 from django.core.urlresolvers import set_script_prefix
 from django.utils import datastructures
 from django.utils.encoding import force_str, force_text, iri_to_uri
-from django.utils.log import getLogger
 
-logger = getLogger('django.request')
+logger = logging.getLogger('django.request')
 
 
 # See http://www.iana.org/assignments/http-status-codes
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py
index c8b88d5619..5837922061 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql_psycopg2/base.py
@@ -3,6 +3,7 @@ PostgreSQL database backend for Django.
 
 Requires psycopg 2: http://initd.org/projects/psycopg2
 """
+import logging
 import sys
 
 from django.db import utils
@@ -14,7 +15,6 @@ from django.db.backends.postgresql_psycopg2.creation import DatabaseCreation
 from django.db.backends.postgresql_psycopg2.version import get_version
 from django.db.backends.postgresql_psycopg2.introspection import DatabaseIntrospection
 from django.utils.encoding import force_str
-from django.utils.log import getLogger
 from django.utils.safestring import SafeText, SafeBytes
 from django.utils import six
 from django.utils.timezone import utc
@@ -33,7 +33,7 @@ psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 psycopg2.extensions.register_adapter(SafeBytes, psycopg2.extensions.QuotedString)
 psycopg2.extensions.register_adapter(SafeText, psycopg2.extensions.QuotedString)
 
-logger = getLogger('django.db.backends')
+logger = logging.getLogger('django.db.backends')
 
 def utc_tzinfo_factory(offset):
     if offset != 0:
diff --git a/django/db/backends/util.py b/django/db/backends/util.py
index 75d4d07a66..e029c42899 100644
--- a/django/db/backends/util.py
+++ b/django/db/backends/util.py
@@ -3,15 +3,15 @@ from __future__ import unicode_literals
 import datetime
 import decimal
 import hashlib
+import logging
 from time import time
 
 from django.conf import settings
 from django.utils.encoding import force_bytes
-from django.utils.log import getLogger
 from django.utils.timezone import utc
 
 
-logger = getLogger('django.db.backends')
+logger = logging.getLogger('django.db.backends')
 
 
 class CursorWrapper(object):
diff --git a/django/middleware/common.py b/django/middleware/common.py
index bb24977ce8..0ec17fbe92 100644
--- a/django/middleware/common.py
+++ b/django/middleware/common.py
@@ -1,4 +1,5 @@
 import hashlib
+import logging
 import re
 
 from django.conf import settings
@@ -6,9 +7,9 @@ from django import http
 from django.core.mail import mail_managers
 from django.utils.http import urlquote
 from django.core import urlresolvers
-from django.utils.log import getLogger
 
-logger = getLogger('django.request')
+
+logger = logging.getLogger('django.request')
 
 
 class CommonMiddleware(object):
diff --git a/django/middleware/csrf.py b/django/middleware/csrf.py
index c9e8d73c82..b2eb0df3f5 100644
--- a/django/middleware/csrf.py
+++ b/django/middleware/csrf.py
@@ -7,6 +7,7 @@ against request forgeries from other sites.
 from __future__ import unicode_literals
 
 import hashlib
+import logging
 import re
 import random
 
@@ -15,10 +16,10 @@ from django.core.urlresolvers import get_callable
 from django.utils.cache import patch_vary_headers
 from django.utils.encoding import force_text
 from django.utils.http import same_origin
-from django.utils.log import getLogger
 from django.utils.crypto import constant_time_compare, get_random_string
 
-logger = getLogger('django.request')
+
+logger = logging.getLogger('django.request')
 
 REASON_NO_REFERER = "Referer checking failed - no Referer."
 REASON_BAD_REFERER = "Referer checking failed - %s does not match %s."
diff --git a/django/views/decorators/http.py b/django/views/decorators/http.py
index d5c4bff744..410979e1e4 100644
--- a/django/views/decorators/http.py
+++ b/django/views/decorators/http.py
@@ -2,18 +2,18 @@
 Decorators for views based on HTTP headers.
 """
 
+import logging
 from calendar import timegm
 from functools import wraps
 
 from django.utils.decorators import decorator_from_middleware, available_attrs
 from django.utils.http import http_date, parse_http_date_safe, parse_etags, quote_etag
-from django.utils.log import getLogger
 from django.middleware.http import ConditionalGetMiddleware
 from django.http import HttpResponseNotAllowed, HttpResponseNotModified, HttpResponse
 
 conditional_page = decorator_from_middleware(ConditionalGetMiddleware)
 
-logger = getLogger('django.request')
+logger = logging.getLogger('django.request')
 
 
 def require_http_methods(request_method_list):
diff --git a/django/views/generic/base.py b/django/views/generic/base.py
index e11412ba4d..d2349e1fca 100644
--- a/django/views/generic/base.py
+++ b/django/views/generic/base.py
@@ -1,14 +1,15 @@
 from __future__ import unicode_literals
 
+import logging
 from functools import update_wrapper
+
 from django import http
 from django.core.exceptions import ImproperlyConfigured
 from django.template.response import TemplateResponse
-from django.utils.log import getLogger
 from django.utils.decorators import classonlymethod
 from django.utils import six
 
-logger = getLogger('django.request')
+logger = logging.getLogger('django.request')
 
 
 class ContextMixin(object):
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)