Commit 2abfd5dd authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #2109 -- Convert old-style classes to new-style classes throughout...

Fixed #2109 -- Convert old-style classes to new-style classes throughout Django. Thanks, Nicola Larosa

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5edd1335
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ from django.conf import global_settings

ENVIRONMENT_VARIABLE = "DJANGO_SETTINGS_MODULE"

class LazySettings:
class LazySettings(object):
    """
    A lazy proxy for either global Django settings or a custom settings object.
    The user can manually configure settings prior to using them. Otherwise,
@@ -67,7 +67,7 @@ class LazySettings:
            setattr(holder, name, value)
        self._target = holder

class Settings:
class Settings(object):
    def __init__(self, settings_module):
        # update this dict from global settings (but only for ALL_CAPS settings)
        for setting in dir(global_settings):
@@ -112,7 +112,7 @@ class Settings:
    def get_all_members(self):
        return dir(self)

class UserSettingsHolder:
class UserSettingsHolder(object):
    """
    Holder for user configured settings.
    """
+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ class LazyUser(object):
                self._user = AnonymousUser()
        return self._user

class AuthenticationMiddleware:
class AuthenticationMiddleware(object):
    def process_request(self, request):
        assert hasattr(request, 'session'), "The Django authentication middleware requires session middleware to be installed. Edit your MIDDLEWARE_CLASSES setting to insert 'django.contrib.sessions.middleware.SessionMiddleware'."
        request.__class__.user = LazyUser()
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ from django.contrib.flatpages.views import flatpage
from django.http import Http404
from django.conf import settings

class FlatpageFallbackMiddleware:
class FlatpageFallbackMiddleware(object):
    def process_response(self, request, response):
        if response.status_code != 404:
            return response # No need to check for a flatpage for non-404 responses.
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ from django.contrib.redirects.models import Redirect
from django import http
from django.conf import settings

class RedirectFallbackMiddleware:
class RedirectFallbackMiddleware(object):
    def process_response(self, request, response):
        if response.status_code != 404:
            return response # No need to check for a redirect for non-404 responses.
+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class SessionWrapper(object):

    _session = property(_get_session)

class SessionMiddleware:
class SessionMiddleware(object):
    def process_request(self, request):
        request.session = SessionWrapper(request.COOKIES.get(settings.SESSION_COOKIE_NAME, None))

Loading