Changeset 2901

Timestamp:

05/13/06 12:18:42 (3 years ago)

Author:

jacob

Message:

Fixed #1235: email sent from django.core.mail will now be encoded using
the value of the DEFAULT_CHARSET setting. Thanks, igor@goryachev.org and akaihola.

Files:

• django/trunk/django/core/mail.py (modified) (3 diffs)
• django/trunk/docs/email.txt (modified) (1 diff)

django/trunk/django/core/mail.py

@@ -3 +3 @@
-from django.conf import settings
-from email.MIMEText import MIMEText
+from email.Header import Header
-import smtplib
-
@@ -13 +14 @@
-        if '\n' in val or '\r' in val:
-            raise BadHeaderError, "Header values can't contain newlines (got %r for header %r)" % (val, name)
+        if name == "Subject":
+            val = Header(val, settings.DEFAULT_CHARSET)
-        MIMEText.__setitem__(self, name, val)
-
@@ -43 +46 @@
-            continue
-        from_email = from_email or settings.DEFAULT_FROM_EMAIL
-
+, 'plain', settings.DEFAULT_CHARSET
-        msg['Subject'] = subject
-        msg['From'] = from_email

django/trunk/docs/email.txt

@@ -20 +20 @@
-    send_mail('Subject here', 'Here is the message.', 'from@example.com',
-        ['to@example.com'], fail_silently=False)
+        
+.. note::
+
+    The character set of email sent with ``django.core.mail`` will be set to
+    the value of your `DEFAULT_CHARSET setting`_.
+    
+.. _DEFAULT_CHARSET setting: ../settings/#DEFAULT_CHARSET
-
-send_mail()