p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1232 from fusionbox/normalize_email 

Fixed #20531 -- Don't hard-code class names when calling static methods
This commit is contained in:
Claude Paroz 2013-05-31 00:56:56 -07:00
parent 728d3fe1ba 01ae881bb4
commit 3d883e8bd9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/auth/models.py
View File

@ -177,7 +177,7 @@ class UserManager(BaseUserManager):
now = timezone.now() now = timezone.now()
if not username: if not username:
raise ValueError('The given username must be set') 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, user = self.model(username=username, email=email,
is_staff=False, is_active=True, is_superuser=False, is_staff=False, is_active=True, is_superuser=False,
last_login=now, date_joined=now, **extra_fields) last_login=now, date_joined=now, **extra_fields)

2
django/contrib/auth/tests/test_custom_user.py
View File

@ -21,7 +21,7 @@ class CustomUserManager(BaseUserManager):
raise ValueError('Users must have an email address') raise ValueError('Users must have an email address')
user = self.model( user = self.model(
email=CustomUserManager.normalize_email(email), email=self.normalize_email(email),
date_of_birth=date_of_birth, date_of_birth=date_of_birth,
) )

2
docs/topics/auth/customizing.txt
View File

@ -939,7 +939,7 @@ authentication app::
raise ValueError('Users must have an email address') raise ValueError('Users must have an email address')
user = self.model( user = self.model(
email=MyUserManager.normalize_email(email), email=self.normalize_email(email),
date_of_birth=date_of_birth, date_of_birth=date_of_birth,
) )