Another change related to permitting '@' in the usernames.

 - Legacy-Id: 2057

Author: levkowetz

django/contrib/admin/sites.py

@@ -305,13 +305,13 @@ def login(self, request):
                 try:
                     user = User.objects.get(email=username)
                 except (User.DoesNotExist, User.MultipleObjectsReturned):
-                    message = _("Usernames cannot contain the '@' character.")
+                    pass
                 else:
                     if user.check_password(password):
                         message = _("Your e-mail address is not your username."
                                     " Try '%s' instead.") % user.username
                     else:
-                        message = _("Usernames cannot contain the '@' character.")
+                        pass
             return self.display_login_form(request, message)
 
         # The user data is correct; log in the user in and continue.