mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-14 16:09:12 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: changed explicit settings import to qualified settings import in django.contrib.auth

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Georg Bauer 2006-01-16 15:00:42 +00:00
parent bae1f6815b
commit 22012296bd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/contrib/auth/models.py
View File

@ -197,16 +197,16 @@ class User(models.Model):
SiteProfileNotAvailable if this site does not allow profiles. SiteProfileNotAvailable if this site does not allow profiles.
""" """
if not hasattr(self, '_profile_cache'): if not hasattr(self, '_profile_cache'):
from django.conf.settings import AUTH_PROFILE_MODULE from django.conf import settings
if not AUTH_PROFILE_MODULE: if not settings.AUTH_PROFILE_MODULE:
raise SiteProfileNotAvailable raise SiteProfileNotAvailable
try: try:
app, mod = AUTH_PROFILE_MODULE.split('.') app, mod = settings.AUTH_PROFILE_MODULE.split('.')
module = __import__('ellington.%s.apps.%s' % (app, mod), [], [], ['']) module = __import__('ellington.%s.apps.%s' % (app, mod), [], [], [''])
self._profile_cache = module.get_object(user_id=self.id) self._profile_cache = module.get_object(user_id=self.id)
except ImportError: except ImportError:
try: try:
module = __import__('django.models.%s' % AUTH_PROFILE_MODULE, [], [], ['']) module = __import__('django.models.%s' % settings.AUTH_PROFILE_MODULE, [], [], [''])
self._profile_cache = module.get_object(user__id__exact=self.id) self._profile_cache = module.get_object(user__id__exact=self.id)
except ImportError: except ImportError:
raise SiteProfileNotAvailable raise SiteProfileNotAvailable