From 128787d3b5b1d3e134ef42bb45fa8aeaf699ce19 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sat, 25 Jul 2009 05:17:38 +0000 Subject: [PATCH] [1.0.X] Fixed #11546 -- Modified the mail regression test to avoid getting hung up on 32/64 bit differences. Thanks to Richard Davies for the report. Merge of r11328 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11329 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/mail/tests.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/regressiontests/mail/tests.py b/tests/regressiontests/mail/tests.py index d691fc0095..724f38ad12 100644 --- a/tests/regressiontests/mail/tests.py +++ b/tests/regressiontests/mail/tests.py @@ -62,8 +62,8 @@ BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection T # Make sure we can manually set the From header (#9214) ->>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'}) ->>> message = email.message() +>>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@example.com'}) +>>> message = email.message() >>> message['From'] 'from@example.com' @@ -87,8 +87,7 @@ To: to@example.com Date: Fri, 09 Nov 2001 01:08:47 -0000 Message-ID: foo ... -Content-Type: multipart/alternative; boundary="..." -MIME-Version: 1.0 +Content-Type: multipart/alternative;... ... Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0