Introduced as_bytes for SafeMIMEText (and other SafeMIME-classes).
This is to provide a consistent interface (namely bytes) for the smtp backend which after all sends bytes over the wire; encoding with as_string yields different results since mails as unicode are not really specified. as_string stays for backwardscompatibilty mostly and some debug outputs. But keep in mind that the output doesn't match as_bytes!
This commit is contained in:
Florian Apolloner
parent
280c1a65cc
commit
5dfd824d38
|
|
@ -7,7 +7,6 @@ from django.conf import settings
|
|||
from django.core.mail.backends.base import BaseEmailBackend
|
||||
from django.core.mail.utils import DNS_NAME
|
||||
from django.core.mail.message import sanitize_address
|
||||
from django.utils.encoding import force_bytes
|
||||
|
||||
|
||||
class EmailBackend(BaseEmailBackend):
|
||||
|
|
@ -111,10 +110,8 @@ class EmailBackend(BaseEmailBackend):
|
|||
recipients = [sanitize_address(addr, email_message.encoding)
|
||||
for addr in email_message.recipients()]
|
||||
message = email_message.message()
|
||||
charset = message.get_charset().get_output_charset() if message.get_charset() else 'utf-8'
|
||||
try:
|
||||
self.connection.sendmail(from_email, recipients,
|
||||
force_bytes(message.as_string(), charset))
|
||||
self.connection.sendmail(from_email, recipients, message.as_bytes())
|
||||
except smtplib.SMTPException:
|
||||
if not self.fail_silently:
|
||||
raise
|
||||
|
|
|
|||
|
|
@ -131,23 +131,27 @@ class MIMEMixin():
|
|||
This overrides the default as_string() implementation to not mangle
|
||||
lines that begin with 'From '. See bug #13433 for details.
|
||||
"""
|
||||
# Using a normal Generator on python 3 will yield a string, which will
|
||||
# get base64 encoded in some cases to ensure that it's always convertable
|
||||
# to ascii. We don't want base64 encoded emails, so we use a BytesGenertor
|
||||
# which will do the right thing and then decode according to our known
|
||||
# encoding. See #21093 and #3472 for details.
|
||||
if six.PY3 and sys.version_info >= (3, 3, 3):
|
||||
fp = six.BytesIO()
|
||||
g = generator.BytesGenerator(fp, mangle_from_=False)
|
||||
g.flatten(self, unixfrom=unixfrom)
|
||||
encoding = self.get_charset().get_output_charset() if self.get_charset() else 'utf-8'
|
||||
return fp.getvalue().decode(encoding)
|
||||
else:
|
||||
fp = six.StringIO()
|
||||
g = generator.Generator(fp, mangle_from_=False)
|
||||
g.flatten(self, unixfrom=unixfrom)
|
||||
return fp.getvalue()
|
||||
|
||||
if six.PY2:
|
||||
as_bytes = as_string
|
||||
else:
|
||||
def as_bytes(self, unixfrom=False):
|
||||
"""Return the entire formatted message as bytes.
|
||||
Optional `unixfrom' when True, means include the Unix From_ envelope
|
||||
header.
|
||||
|
||||
This overrides the default as_bytes() implementation to not mangle
|
||||
lines that begin with 'From '. See bug #13433 for details.
|
||||
"""
|
||||
fp = six.BytesIO()
|
||||
g = generator.BytesGenerator(fp, mangle_from_=False)
|
||||
g.flatten(self, unixfrom=unixfrom)
|
||||
return fp.getvalue()
|
||||
|
||||
|
||||
class SafeMIMEMessage(MIMEMixin, MIMEMessage):
|
||||
|
||||
|
|
@ -167,9 +171,8 @@ class SafeMIMEText(MIMEMixin, MIMEText):
|
|||
# We do it manually and trigger re-encoding of the payload.
|
||||
MIMEText.__init__(self, text, subtype, None)
|
||||
del self['Content-Transfer-Encoding']
|
||||
# Work around a bug in python 3.3.3 [sic], see
|
||||
# http://bugs.python.org/issue19063 for details.
|
||||
if sys.version_info[:3] == (3, 3, 3):
|
||||
# Workaround for versions without http://bugs.python.org/issue19063
|
||||
if (3, 2) < sys.version_info < (3, 3, 4):
|
||||
payload = text.encode(utf8_charset.output_charset)
|
||||
self._payload = payload.decode('ascii', 'surrogateescape')
|
||||
self.set_charset(utf8_charset)
|
||||
|
|
|
|||
|
|
@ -20,14 +20,16 @@ from django.core.mail.backends import console, dummy, locmem, filebased, smtp
|
|||
from django.core.mail.message import BadHeaderError
|
||||
from django.test import SimpleTestCase
|
||||
from django.test import override_settings
|
||||
from django.utils.encoding import force_str, force_text
|
||||
from django.utils.encoding import force_str, force_text, force_bytes
|
||||
from django.utils.six import PY3, StringIO, string_types
|
||||
from django.utils.translation import ugettext_lazy
|
||||
|
||||
if PY3:
|
||||
from email.utils import parseaddr
|
||||
from email import message_from_bytes
|
||||
else:
|
||||
from email.Utils import parseaddr
|
||||
message_from_bytes = message_from_string
|
||||
|
||||
|
||||
class HeadersCheckMixin(object):
|
||||
|
|
@ -231,13 +233,13 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
|
|||
('MIME-Version', '1.0'),
|
||||
('Content-Type', 'text/plain; charset="iso-8859-1"'),
|
||||
('Content-Transfer-Encoding', 'quoted-printable')})
|
||||
self.assertTrue(payload0.as_string().endswith('\n\nFirstname S=FCrname is a great guy.'))
|
||||
self.assertTrue(payload0.as_bytes().endswith(b'\n\nFirstname S=FCrname is a great guy.'))
|
||||
payload1 = msg.message().get_payload(1)
|
||||
self.assertMessageHasHeaders(payload1, {
|
||||
('MIME-Version', '1.0'),
|
||||
('Content-Type', 'text/html; charset="iso-8859-1"'),
|
||||
('Content-Transfer-Encoding', 'quoted-printable')})
|
||||
self.assertTrue(payload1.as_string().endswith('\n\n<p>Firstname S=FCrname is a <strong>great</strong> guy.</p>'))
|
||||
self.assertTrue(payload1.as_bytes().endswith(b'\n\n<p>Firstname S=FCrname is a <strong>great</strong> guy.</p>'))
|
||||
|
||||
def test_attachments(self):
|
||||
"""Regression test for #9367"""
|
||||
|
|
@ -248,8 +250,8 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
|
|||
msg = EmailMultiAlternatives(subject, text_content, from_email, [to], headers=headers)
|
||||
msg.attach_alternative(html_content, "text/html")
|
||||
msg.attach("an attachment.pdf", b"%PDF-1.4.%...", mimetype="application/pdf")
|
||||
msg_str = msg.message().as_string()
|
||||
message = message_from_string(msg_str)
|
||||
msg_bytes = msg.message().as_bytes()
|
||||
message = message_from_bytes(msg_bytes)
|
||||
self.assertTrue(message.is_multipart())
|
||||
self.assertEqual(message.get_content_type(), 'multipart/mixed')
|
||||
self.assertEqual(message.get_default_type(), 'text/plain')
|
||||
|
|
@ -265,8 +267,8 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
|
|||
msg = EmailMessage(subject, content, from_email, [to], headers=headers)
|
||||
# Unicode in file name
|
||||
msg.attach("une pièce jointe.pdf", b"%PDF-1.4.%...", mimetype="application/pdf")
|
||||
msg_str = msg.message().as_string()
|
||||
message = message_from_string(msg_str)
|
||||
msg_bytes = msg.message().as_bytes()
|
||||
message = message_from_bytes(msg_bytes)
|
||||
payload = message.get_payload()
|
||||
self.assertEqual(payload[1].get_filename(), 'une pièce jointe.pdf')
|
||||
|
||||
|
|
@ -348,31 +350,31 @@ class MailTests(HeadersCheckMixin, SimpleTestCase):
|
|||
# Regression for #13433 - Make sure that EmailMessage doesn't mangle
|
||||
# 'From ' in message body.
|
||||
email = EmailMessage('Subject', 'From the future', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
|
||||
self.assertFalse('>From the future' in email.message().as_string())
|
||||
self.assertFalse(b'>From the future' in email.message().as_bytes())
|
||||
|
||||
def test_dont_base64_encode(self):
|
||||
# Ticket #3472
|
||||
# Shouldn't use Base64 encoding at all
|
||||
msg = EmailMessage('Subject', 'UTF-8 encoded body', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
|
||||
self.assertFalse('Content-Transfer-Encoding: base64' in msg.message().as_string())
|
||||
self.assertFalse(b'Content-Transfer-Encoding: base64' in msg.message().as_bytes())
|
||||
|
||||
# Ticket #11212
|
||||
# Shouldn't use quoted printable, should detect it can represent content with 7 bit data
|
||||
msg = EmailMessage('Subject', 'Body with only ASCII characters.', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
|
||||
s = msg.message().as_string()
|
||||
self.assertFalse('Content-Transfer-Encoding: quoted-printable' in s)
|
||||
self.assertTrue('Content-Transfer-Encoding: 7bit' in s)
|
||||
s = msg.message().as_bytes()
|
||||
self.assertFalse(b'Content-Transfer-Encoding: quoted-printable' in s)
|
||||
self.assertTrue(b'Content-Transfer-Encoding: 7bit' in s)
|
||||
|
||||
# Shouldn't use quoted printable, should detect it can represent content with 8 bit data
|
||||
msg = EmailMessage('Subject', 'Body with latin characters: àáä.', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
|
||||
s = msg.message().as_string()
|
||||
self.assertFalse(str('Content-Transfer-Encoding: quoted-printable') in s)
|
||||
self.assertTrue(str('Content-Transfer-Encoding: 8bit') in s)
|
||||
s = msg.message().as_bytes()
|
||||
self.assertFalse(b'Content-Transfer-Encoding: quoted-printable' in s)
|
||||
self.assertTrue(b'Content-Transfer-Encoding: 8bit' in s)
|
||||
|
||||
msg = EmailMessage('Subject', 'Body with non latin characters: А Б В Г Д Е Ж Ѕ З И І К Л М Н О П.', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'})
|
||||
s = msg.message().as_string()
|
||||
self.assertFalse(str('Content-Transfer-Encoding: quoted-printable') in s)
|
||||
self.assertTrue(str('Content-Transfer-Encoding: 8bit') in s)
|
||||
s = msg.message().as_bytes()
|
||||
self.assertFalse(b'Content-Transfer-Encoding: quoted-printable' in s)
|
||||
self.assertTrue(b'Content-Transfer-Encoding: 8bit' in s)
|
||||
|
||||
def test_dont_base64_encode_message_rfc822(self):
|
||||
# Ticket #18967
|
||||
|
|
@ -476,7 +478,7 @@ class BaseEmailBackendTests(HeadersCheckMixin, object):
|
|||
self.assertEqual(num_sent, 1)
|
||||
message = self.get_the_message()
|
||||
self.assertEqual(message["subject"], '=?utf-8?q?Ch=C3=A8re_maman?=')
|
||||
self.assertEqual(force_text(message.get_payload()), 'Je t\'aime très fort')
|
||||
self.assertEqual(force_text(message.get_payload(decode=True)), 'Je t\'aime très fort')
|
||||
|
||||
def test_send_many(self):
|
||||
email1 = EmailMessage('Subject', 'Content1', 'from@example.com', ['to@example.com'])
|
||||
|
|
@ -746,8 +748,8 @@ class ConsoleBackendTests(BaseEmailBackendTests, SimpleTestCase):
|
|||
self.stream = sys.stdout = StringIO()
|
||||
|
||||
def get_mailbox_content(self):
|
||||
messages = force_text(self.stream.getvalue()).split('\n' + ('-' * 79) + '\n')
|
||||
return [message_from_string(force_str(m)) for m in messages if m]
|
||||
messages = self.stream.getvalue().split(force_str('\n' + ('-' * 79) + '\n'))
|
||||
return [message_from_bytes(force_bytes(m)) for m in messages if m]
|
||||
|
||||
def test_console_stream_kwarg(self):
|
||||
"""
|
||||
|
|
@ -793,7 +795,9 @@ class FakeSMTPServer(smtpd.SMTPServer, threading.Thread):
|
|||
self.sink_lock = threading.Lock()
|
||||
|
||||
def process_message(self, peer, mailfrom, rcpttos, data):
|
||||
m = message_from_string(data)
|
||||
if PY3:
|
||||
data = data.encode('utf-8')
|
||||
m = message_from_bytes(data)
|
||||
maddr = parseaddr(m.get('from'))[1]
|
||||
if mailfrom != maddr:
|
||||
return "553 '%s' != '%s'" % (mailfrom, maddr)
|
||||
|
|
|
|||
Loading…
Reference in New Issue