Commit 34a3b7b6 authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

[1.1.X] Fixed #5605: only lowercase the domain portion of an email address in... 

[1.1.X] Fixed #5605: only lowercase the domain portion of an email address in `UserManager.create_user`.

Thanks, Leo.

Backport of [12641] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent ac72c8d1

django/contrib/auth/models.py

+18 −2
Original line number Diff line number Diff line
@@ -95,9 +95,25 @@ class Group(models.Model): 


class UserManager(models.Manager):

    def create_user(self, username, email, password=None):

        "Creates and saves a User with the given username, e-mail and password."

        """

        Creates and saves a User with the given username, e-mail and password.

        """



        now = datetime.datetime.now()

        user = self.model(None, username, '', '', email.strip().lower(), 'placeholder', False, True, False, now, now)

        

        # Normalize the address by lowercasing the domain part of the email

        # address.

        try:

            email_name, domain_part = email.strip().split('@', 1)

        except ValueError:

            pass

        else:

            email = '@'.join([email_name, domain_part.lower()])



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

                         is_active=True, is_superuser=False, last_login=now,

                         date_joined=now)



        if password:

            user.set_password(password)

        else:

django/contrib/auth/tests/forms.py

+9 −0
Original line number Diff line number Diff line
@@ -219,4 +219,13 @@ True 
>>> form.cleaned_data['email']

u'jsmith3@example.com'



# bug #5605, preserve the case of the user name (before the @ in the email address)

# when creating a user.

>>> user = User.objects.create_user('test2', 'tesT@EXAMple.com', 'test')

>>> user.email

'tesT@example.com'

>>> user = User.objects.create_user('test3', 'tesT', 'test')

>>> user.email

'tesT'



"""

docs/topics/auth.txt

+10 −4
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ The auth system consists of: 
      user.

    * Messages: A simple way to queue messages for given users.



.. deprecated:: 1.2

   The Messages component of the auth system will be removed in Django 1.4.



Installation

============
@@ -261,10 +264,13 @@ Manager functions 
    .. method:: models.UserManager.create_user(username, email, password=None)



        Creates, saves and returns a :class:`~django.contrib.auth.models.User`.

        The :attr:`~django.contrib.auth.models.User.username`,

        :attr:`~django.contrib.auth.models.User.email` and

        :attr:`~django.contrib.auth.models.User.password` are set as given, and

        the :class:`~django.contrib.auth.models.User` gets ``is_active=True``.

        

        The :attr:`~django.contrib.auth.models.User.username` and

        :attr:`~django.contrib.auth.models.User.password` are set as given. The

        domain portion of :attr:`~django.contrib.auth.models.User.email` is

        automatically convered to lowercase, and the returned

        :class:`~django.contrib.auth.models.User` object will have

        :attr:`~models.User.is_active` set to ``True``.



        If no password is provided,

        :meth:`~django.contrib.auth.models.User.set_unusable_password()` will