diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2013-12-28 15:24:25 +0100 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2013-12-28 16:01:40 +0100 |
| commit | ed167e53a52af22a8dce229696184b0d87a88a78 (patch) | |
| tree | 11440e7c8876b8a24b02291e942378cf8c1d8411 /tests | |
| parent | 35a447a263115b22a7040a9f4a16ff4bd2078466 (diff) | |
[1.6.x] Worked around a bug in python 3.3.3. Refs #21093
Backport of 280c1a65ccacd679bf298bf2b169ff01e7266b8e from master.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mail/tests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mail/tests.py b/tests/mail/tests.py index c90dc7e22a..01dbeb01e0 100644 --- a/tests/mail/tests.py +++ b/tests/mail/tests.py @@ -460,7 +460,7 @@ class BaseEmailBackendTests(object): email = EmailMessage('Subject', 'Content', 'from@example.com', ['to@example.com'], cc=['cc@example.com']) mail.get_connection().send_messages([email]) message = self.get_the_message() - self.assertStartsWith(message.as_string(), 'Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: 7bit\nSubject: Subject\nFrom: from@example.com\nTo: to@example.com\nCc: cc@example.com\nDate: ') + self.assertStartsWith(message.as_string(), 'MIME-Version: 1.0\nContent-Type: text/plain; charset="utf-8"\nContent-Transfer-Encoding: 7bit\nSubject: Subject\nFrom: from@example.com\nTo: to@example.com\nCc: cc@example.com\nDate: ') def test_idn_send(self): """ @@ -618,7 +618,7 @@ class ConsoleBackendTests(BaseEmailBackendTests, TestCase): s = StringIO() connection = mail.get_connection('django.core.mail.backends.console.EmailBackend', stream=s) send_mail('Subject', 'Content', 'from@example.com', ['to@example.com'], connection=connection) - self.assertTrue(s.getvalue().startswith('Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: 7bit\nSubject: Subject\nFrom: from@example.com\nTo: to@example.com\nDate: ')) + self.assertTrue(s.getvalue().startswith('MIME-Version: 1.0\nContent-Type: text/plain; charset="utf-8"\nContent-Transfer-Encoding: 7bit\nSubject: Subject\nFrom: from@example.com\nTo: to@example.com\nDate: ')) class FakeSMTPServer(smtpd.SMTPServer, threading.Thread): |