From 965cdefad0a5578a964e4e5d9e8c9ffd2b256cbd Mon Sep 17 00:00:00 2001 From: Joseph Kocherhans Date: Fri, 21 Apr 2006 21:09:19 +0000 Subject: [PATCH] magic-removal: fixed part of #1659... references to django.models in django/contrib/auth/models.py Thanks ubernostrum. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2723 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/auth/models.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py index 79f7cbc760..a9c8883bf8 100644 --- a/django/contrib/auth/models.py +++ b/django/contrib/auth/models.py @@ -207,15 +207,11 @@ class User(models.Model): if not settings.AUTH_PROFILE_MODULE: raise SiteProfileNotAvailable try: - app, mod = settings.AUTH_PROFILE_MODULE.split('.') - module = __import__('ellington.%s.apps.%s' % (app, mod), [], [], ['']) - self._profile_cache = module.get(user_id=self.id) - except ImportError: - try: - module = __import__('django.models.%s' % settings.AUTH_PROFILE_MODULE, [], [], ['']) - self._profile_cache = module.get(user__id__exact=self.id) - except ImportError: - raise SiteProfileNotAvailable + app_label, model_name = settings.AUTH_PROFILE_MODULE.split('.') + model = models.get_model(app_label, model_name) + self._profile_cache = model._default_manager.get(user__id__exact=self.id) + except ImportError, ImproperlyConfigured: + raise SiteProfileNotAvailable return self._profile_cache class Message(models.Model):