Ticket #10858: auth_user_model_unicode.diff

django/contrib/auth/models.py

@@ -2 +2 @@
 import urllib
 
 from django.contrib import auth
+from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import models
 from django.db.models.manager import EmptyManager
@@ -145 +146 @@
         verbose_name_plural = _('users')
 
     def __unicode__(self):
-        return self.username
+        fmt = getattr(settings, 'AUTH_USER_STR_FORMATTER', None)
+        if fmt is not None:
+            return fmt(self)
+        else:
+            return self.username
 
     def get_absolute_url(self):
         return "/users/%s/" % urllib.quote(smart_str(self.username))
@@ -276 +281 @@
         SiteProfileNotAvailable if this site does not allow profiles.
         """
         if not hasattr(self, '_profile_cache'):
-            from django.conf import settings
             if not getattr(settings, 'AUTH_PROFILE_MODULE', False):
                 raise SiteProfileNotAvailable
             try: