summaryrefslogtreecommitdiffstats
path: root/Lib/email/test/data
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-02-21 04:39:40 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-02-21 04:39:40 (GMT)
commit57c45ac5e508cfa62efab9c372d1c08544f2f5b4 (patch)
tree2ff002979ce53f658dbd241abf3a8cc58afe9679 /Lib/email/test/data
parent734f05925ef57e34e13efd501a47556a98ea3085 (diff)
downloadcpython-57c45ac5e508cfa62efab9c372d1c08544f2f5b4.zip
cpython-57c45ac5e508cfa62efab9c372d1c08544f2f5b4.tar.gz
cpython-57c45ac5e508cfa62efab9c372d1c08544f2f5b4.tar.bz2
Merged revisions 78274 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78274 | r.david.murray | 2010-02-20 23:23:00 -0500 (Sat, 20 Feb 2010) | 9 lines Issue 7970: When email.Parser.Parser parses a MIME message of type message/rfc822 it turns it into an object whose body consists of a list containing a single Message object. HeaderParser, on the other hand, just copies the body as a string. Generator.flatten has a special handler for the message mime type that expected the body to be the one item list. This fails if the message was parsed by HeaderParser. So we now check to see if the body is a string first, and if so just we just emit it. ........
Diffstat (limited to 'Lib/email/test/data')
-rw-r--r--Lib/email/test/data/msg_46.txt23
1 files changed, 23 insertions, 0 deletions
diff --git a/Lib/email/test/data/msg_46.txt b/Lib/email/test/data/msg_46.txt
new file mode 100644
index 0000000..1e22c4f
--- /dev/null
+++ b/Lib/email/test/data/msg_46.txt
@@ -0,0 +1,23 @@
+Return-Path: <sender@example.net>
+Delivery-Date: Mon, 08 Feb 2010 14:05:16 +0100
+Received: from example.org (example.org [64.5.53.58])
+ by example.net (node=mxbap2) with ESMTP (Nemesis)
+ id UNIQUE for someone@example.com; Mon, 08 Feb 2010 14:05:16 +0100
+Date: Mon, 01 Feb 2010 12:21:16 +0100
+From: "Sender" <sender@example.net>
+To: <someone@example.com>
+Subject: GroupwiseForwardingTest
+Mime-Version: 1.0
+Content-Type: message/rfc822
+
+Return-path: <sender@example.net>
+Message-ID: <4B66B890.4070408@teconcept.de>
+Date: Mon, 01 Feb 2010 12:18:40 +0100
+From: "Dr. Sender" <sender@example.net>
+MIME-Version: 1.0
+To: "Recipient" <recipient@example.com>
+Subject: GroupwiseForwardingTest
+Content-Type: text/plain; charset=ISO-8859-15
+Content-Transfer-Encoding: 7bit
+
+Testing email forwarding with Groupwise 1.2.2010