Commit 26ff2be7 authored by Claude Paroz's avatar Claude Paroz
Browse files

Imported getLogger directly from logging module 

This was a remainder of some 2.4 compatibility code.
parent 89136b27

django/core/handlers/base.py

+2 −2
Original line number Diff line number Diff line 
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):

django/core/handlers/wsgi.py

+2 −2
Original line number Diff line number Diff line 
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

django/db/backends/postgresql_psycopg2/base.py

+2 −2
Original line number Diff line number Diff line
@@ -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:

django/db/backends/util.py

+2 −2
Original line number Diff line number Diff line
@@ -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):

django/middleware/common.py

+3 −2
Original line number Diff line number Diff line 
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):