Ticket #5605: 5605_new.diff

django/contrib/auth/models.py

@@ -108 +108 @@
     def create_user(self, username, email, password=None):
         "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)
+        emailusername, emaildomain = email.strip().split('@', 1)
+        user = self.model(None, username, '', '', emailusername + '@' + emaildomain.lower(), 'placeholder', False, True, False, now, now)
         if password:
             user.set_password(password)
         else:
@@ -226 +227 @@
         for backend in auth.get_backends():
             if hasattr(backend, "get_all_permissions"):
                 permissions.update(backend.get_all_permissions(self))
-        return permissions 
+        return permissions
 
     def has_perm(self, perm):
         """
@@ -238 +239 @@
         # Inactive users have no permissions.
         if not self.is_active:
             return False
-        
+
         # Superusers have all permissions.
         if self.is_superuser:
             return True
-            
+
         # Otherwise we need to check the backends.
         for backend in auth.get_backends():
             if hasattr(backend, "has_perm"):

docs/authentication.txt

@@ -168 +168 @@
 The ``User`` model has a custom manager that has the following helper functions:
 
     * ``create_user(username, email, password=None)`` -- Creates, saves and
-      returns a ``User``. The ``username``, ``email`` and ``password`` are set
-      as given, and the ``User`` gets ``is_active=True``.
+      returns a ``User``. The ``username`` and ``password`` are set as
+      given, the domain portion of ``email`` gets lowercased, and the
+      ``User`` gets ``is_active=True``.
 
       If no password is provided, ``set_unusable_password()`` will be called.
 

tests/regressiontests/auth_backends/tests.py

@@ -69 +69 @@
 True
 >>> user.has_perms(['auth.test3', 'auth.test_group'])
 True
+
+# bug #5605, preserve the case of the user name (before the @ in the email address)
+# when creating a user.
+
+>>> user = User.objects.create_user('testusercase2', 'tesT@EXAMple.com', 'test')
+>>> user.email
+'tesT@example.com'
+>>> user = User.objects.create_user('testusercase3', u'tesT@EXAMple.com', 'test')
+>>> user.email
+u'tesT@example.com'
 """}