1. Matthew Schinckel
  2. django-auth-additions

Commits

Matthew Schinckel  committed ab19067

Fix up merge issue.

  • Participants
  • Parent commits 8285a8f
  • Branches default

Comments (0)

Files changed (1)

File auth_additions/models.py

View file
 
 def User__unicode(self):
     return "%s %s <%s>" % (self.first_name, self.last_name, self.email or self.username)
-User.__unicode__ = User__unicodefrom functools import wraps
+User.__unicode__ = User__unicode
 
 
 # Add a queryset method that will allow for