Commit 01ae881b authored by Gavin Wahl's avatar Gavin Wahl
Browse files

Don't hard-code class names when calling static methods 

normalize_email should be called on the instance, not the class. This
has the same effect normally but is more helpful to subclassers. When
methods are called directly on the class, subclasses can't override
them.
parent 1fdc3d25

django/contrib/auth/models.py

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ class UserManager(BaseUserManager): 
        now = timezone.now()

        if not username:

            raise ValueError('The given username must be set')

        email = UserManager.normalize_email(email)

        email = self.normalize_email(email)

        user = self.model(username=username, email=email,

                          is_staff=False, is_active=True, is_superuser=False,

                          last_login=now, date_joined=now, **extra_fields)

django/contrib/auth/tests/test_custom_user.py

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class CustomUserManager(BaseUserManager): 
            raise ValueError('Users must have an email address')



        user = self.model(

            email=CustomUserManager.normalize_email(email),

            email=self.normalize_email(email),

            date_of_birth=date_of_birth,

        )

docs/topics/auth/customizing.txt

+1 −1
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ authentication app:: 
                raise ValueError('Users must have an email address')



            user = self.model(

                email=MyUserManager.normalize_email(email),

                email=self.normalize_email(email),

                date_of_birth=date_of_birth,

            )