Ticket #17046: prevent_empty_username.diff

django/contrib/auth/models.py

@@ -3 +3 @@
 
 from django.core.exceptions import ImproperlyConfigured
 from django.core.mail import send_mail
-from django.db import models
+from django.db import models, IntegrityError
 from django.db.models.manager import EmptyManager
 from django.utils.encoding import smart_str
 from django.utils.translation import ugettext_lazy as _
@@ -93 +93 @@
         """
         now = datetime.datetime.now()
 
+        if username == '':
+            raise IntegrityError("Username can't be blank")
+
         # Normalize the address by lowercasing the domain part of the email
         # address.
         email = email or ''

django/contrib/auth/tests/__init__.py

@@ -10 +10 @@
 from django.contrib.auth.tests.remote_user import (RemoteUserTest,
     RemoteUserNoCreateTest, RemoteUserCustomTest)
 from django.contrib.auth.tests.management import GetDefaultUsernameTestCase
-from django.contrib.auth.tests.models import ProfileTestCase
+from django.contrib.auth.tests.models import ProfileTestCase, UserEmptyUsernameCase
 from django.contrib.auth.tests.signals import SignalTestCase
 from django.contrib.auth.tests.tokens import TokenGeneratorTest
 from django.contrib.auth.tests.views import (AuthViewNamedURLTests, PasswordResetTest,

django/contrib/auth/tests/models.py

@@ -1 +1 @@
 from django.conf import settings
 from django.test import TestCase
 from django.contrib.auth.models import User, SiteProfileNotAvailable
+from django.db import IntegrityError
 
 class ProfileTestCase(TestCase):
     fixtures = ['authtestdata.json']
@@ -33 +34 @@
         # module that doesn't exist
         settings.AUTH_PROFILE_MODULE = 'foo.bar'
         self.assertRaises(SiteProfileNotAvailable, user.get_profile)
+
+
+class UserEmptyUsernameCase(TestCase):
+
+    def test_empty_username(self):
+        with self.assertRaises(IntegrityError):
+            User.objects.create_user(username='', password='passsword',
+                    email='email@email.com')