multi-auth: Merged to [3151]archive/attic/multi-auth

git-svn-id: http://code.djangoproject.com/svn/django/branches/multi-auth@3152 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 3 insertions, 3 deletions

diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index a4aaf46a76..d5477201d7 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -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.
     """