Advertisement
Guest User

Untitled

a guest
Jun 19th, 2016
76
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.10 KB | None | 0 0
  1. diff --git a/django/contrib/auth/models.py b/django/contrib/auth/models.py
  2. index 87c3adf..49bdb32 100644
  3. --- a/django/contrib/auth/models.py
  4. +++ b/django/contrib/auth/models.py
  5. @@ -144,9 +144,8 @@ class UserManager(BaseUserManager):
  6. """
  7. if not username:
  8. raise ValueError('The given username must be set')
  9. - email = self.normalize_email(email)
  10. - username = self.normalize_username(username)
  11. user = self.model(username=username, email=email, **extra_fields)
  12. + user.clean()
  13. user.set_password(password)
  14. user.save(using=self._db)
  15. return user
  16. @@ -344,6 +343,11 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
  17. verbose_name_plural = _('users')
  18. abstract = True
  19.  
  20. + def clean(self):
  21. + super(AbstractUser, self).clean()
  22. + self.email = self.__class__.objects.normalize_email(self.email)
  23. + self.username = self.__class__.objects.normalize_username(self.username)
  24. +
  25. def get_full_name(self):
  26. """
  27. Returns the first_name plus the last_name, with a space in between.
  28. diff --git a/tests/auth_tests/test_forms.py b/tests/auth_tests/test_forms.py
  29. index d2ce828..6b3aac2 100644
  30. --- a/tests/auth_tests/test_forms.py
  31. +++ b/tests/auth_tests/test_forms.py
  32. @@ -129,13 +129,17 @@ class UserCreationFormTest(TestDataMixin, TestCase):
  33. omega_username = 'iamtheΩ' # U+03A9 GREEK CAPITAL LETTER OMEGA
  34. ohm_username = 'iamtheΩ' # U+2126 OHM SIGN
  35. self.assertNotEqual(omega_username, ohm_username)
  36. - User.objects.create_user(username=omega_username, password='pwd')
  37. data = {
  38. - 'username': ohm_username,
  39. + 'username': omega_username,
  40. 'password1': 'pwd2',
  41. 'password2': 'pwd2',
  42. }
  43. form = UserCreationForm(data)
  44. + self.assertTrue(form.is_valid())
  45. + form.save()
  46. +
  47. + data['username'] = ohm_username
  48. + form = UserCreationForm(data)
  49. self.assertFalse(form.is_valid())
  50. self.assertEqual(
  51. form.errors['username'], ["A user with that username already exists."]
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement