mirror of
				https://github.com/django/django.git
				synced 2025-10-31 01:25:32 +00:00 
			
		
		
		
	Fixed a stray __unicode__() method in auth_tests.
This commit is contained in:
		| @@ -3,6 +3,7 @@ from django.contrib.auth.models import ( | ||||
|     PermissionsMixin, UserManager, | ||||
| ) | ||||
| from django.db import models | ||||
| from django.utils.encoding import python_2_unicode_compatible | ||||
|  | ||||
|  | ||||
| # The custom User uses email as the unique identifier, and requires | ||||
| @@ -32,6 +33,7 @@ class CustomUserManager(BaseUserManager): | ||||
|         return u | ||||
|  | ||||
|  | ||||
| @python_2_unicode_compatible | ||||
| class CustomUser(AbstractBaseUser): | ||||
|     email = models.EmailField(verbose_name='email address', max_length=255, unique=True) | ||||
|     is_active = models.BooleanField(default=True) | ||||
| @@ -49,7 +51,7 @@ class CustomUser(AbstractBaseUser): | ||||
|     def get_short_name(self): | ||||
|         return self.email | ||||
|  | ||||
|     def __unicode__(self): | ||||
|     def __str__(self): | ||||
|         return self.email | ||||
|  | ||||
|     # Maybe required? | ||||
|   | ||||
		Reference in New Issue
	
	Block a user