Commit fea15928 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

Fixed #14406 -- Added a Python 2.4 compatibility to the logging interface.... 

Fixed #14406 -- Added a Python 2.4 compatibility to the logging interface. Thanks to Łukasz Rekucki for the report, and to Luke Plant for original patch this was based on.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 57aeb542

django/core/handlers/base.py

+2 −2
Original line number Diff line number Diff line 
import logging

import sys



from django import http

from django.core import signals

from django.utils.encoding import force_unicode

from django.utils.importlib import import_module

from django.utils.log import getLogger



logger = logging.getLogger('django.request')

logger = getLogger('django.request')





class BaseHandler(object):

django/core/handlers/modpython.py

+2 −2
Original line number Diff line number Diff line 
import logging

import os

from pprint import pformat

import sys
@@ -10,8 +9,9 @@ from django.core.handlers.base import BaseHandler 
from django.core.urlresolvers import set_script_prefix

from django.utils import datastructures

from django.utils.encoding import force_unicode, smart_str, iri_to_uri

from django.utils.log import getLogger



logger = logging.getLogger('django.request')

logger = getLogger('django.request')





# NOTE: do *not* import settings (or any module which eventually imports

django/core/handlers/wsgi.py

+2 −2
Original line number Diff line number Diff line 
import logging

from pprint import pformat

import sys

from threading import Lock
@@ -13,8 +12,9 @@ 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_unicode, iri_to_uri

from django.utils.log import getLogger



logger = logging.getLogger('django.request')

logger = getLogger('django.request')





# See http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html

django/db/backends/util.py

+2 −2
Original line number Diff line number Diff line 
import datetime

import decimal

import logging

from time import time



from django.utils.hashcompat import md5_constructor

from django.utils.log import getLogger



logger = logging.getLogger('django.db.backends')

logger = getLogger('django.db.backends')



class CursorDebugWrapper(object):

    def __init__(self, cursor, db):

django/middleware/common.py

+2 −2
Original line number Diff line number Diff line 
import logging

import re



from django.conf import settings
@@ -7,8 +6,9 @@ from django.core.mail import mail_managers 
from django.utils.http import urlquote

from django.core import urlresolvers

from django.utils.hashcompat import md5_constructor

from django.utils.log import getLogger



logger = logging.getLogger('django.request')

logger = getLogger('django.request')





class CommonMiddleware(object):