Ticket #17862: patch_send_mail.diff

django/contrib/auth/forms.py

@@ -214 +214 @@
         Generates a one-use only link for resetting password and sends to the
         user.
         """
-        from django.core.mail import send_mail
+        from django.core.mail import EmailMessage
         for user in self.users_cache:
             if not domain_override:
                 current_site = get_current_site(request)
@@ -235 +235 @@
             # Email subject *must not* contain newlines
             subject = ''.join(subject.splitlines())
             email = loader.render_to_string(email_template_name, c)
-            send_mail(subject, email, from_email, [user.email])
+            EmailMessage(subject, email, from_email, [user.email]).send()
 
 
 class SetPasswordForm(forms.Form):

django/contrib/auth/models.py

@@ -1 +1 @@
 import urllib
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.mail import send_mail
+from django.core.mail import EmailMessage
 from django.db import models
 from django.db.models.manager import EmptyManager
 from django.utils.crypto import get_random_string
@@ -363 +363 @@
         """
         Sends an email to this User.
         """
-        send_mail(subject, message, from_email, [self.email])
+        EmailMessage(subject, message, from_email, [self.email]).send()
 
     def get_profile(self):
         """