Commit c6280796 authored by Tim Graham's avatar Tim Graham
Browse files

Fixed a stray __unicode__() method in auth_tests.

parent e81d1c99
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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?