Django

Code

Changeset 2723

Show
Ignore:
Timestamp:
04/21/06 16:09:19 (3 years ago)
Author:
jkocherhans
Message:

magic-removal: fixed part of #1659... references to django.models in django/contrib/auth/models.py Thanks ubernostrum.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/magic-removal/django/contrib/auth/models.py

    r2661 r2723  
    208208                raise SiteProfileNotAvailable 
    209209            try: 
    210                 app, mod = settings.AUTH_PROFILE_MODULE.split('.') 
    211                 module = __import__('ellington.%s.apps.%s' % (app, mod), [], [], ['']) 
    212                 self._profile_cache = module.get(user_id=self.id) 
    213             except ImportError: 
    214                 try: 
    215                     module = __import__('django.models.%s' % settings.AUTH_PROFILE_MODULE, [], [], ['']) 
    216                     self._profile_cache = module.get(user__id__exact=self.id) 
    217                 except ImportError: 
    218                     raise SiteProfileNotAvailable 
     210                app_label, model_name = settings.AUTH_PROFILE_MODULE.split('.') 
     211                model = models.get_model(app_label, model_name) 
     212                self._profile_cache = model._default_manager.get(user__id__exact=self.id) 
     213            except ImportError, ImproperlyConfigured: 
     214                raise SiteProfileNotAvailable 
    219215        return self._profile_cache 
    220216