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.
........
diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py
index 7736412..27ddc7c 100644
--- a/Lib/email/test/test_email.py
+++ b/Lib/email/test/test_email.py
@@ -178,6 +178,18 @@
self.assertRaises(errors.HeaderParseError,
msg.set_boundary, 'BOUNDARY')
+ def test_message_rfc822_only(self):
+ # Issue 7970: message/rfc822 not in multipart parsed by
+ # HeaderParser caused an exception when flattened.
+ fp = openfile(findfile('msg_46.txt'))
+ msgdata = fp.read()
+ parser = HeaderParser()
+ msg = parser.parsestr(msgdata)
+ out = StringIO()
+ gen = Generator(out, True, 0)
+ gen.flatten(msg, False)
+ self.assertEqual(out.getvalue(), msgdata)
+
def test_get_decoded_payload(self):
eq = self.assertEqual
msg = self._msgobj('msg_10.txt')