summaryrefslogtreecommitdiffstats
path: root/Lib/email/generator.py
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/generator.py
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/generator.py')
-rw-r--r--Lib/email/generator.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py
index 61521b8..996f9dd 100644
--- a/Lib/email/generator.py
+++ b/Lib/email/generator.py
@@ -254,8 +254,16 @@ class Generator:
# of length 1. The zeroth element of the list should be the Message
# object for the subpart. Extract that object, stringify it, and
# write it out.
- g.flatten(msg.get_payload(0), unixfrom=False)
- self._fp.write(s.getvalue())
+ # Except, it turns out, when it's a string instead, which happens when
+ # and only when HeaderParser is used on a message of mime type
+ # message/rfc822. Such messages are generated by, for example,
+ # Groupwise when forwarding unadorned messages. (Issue 7970.) So
+ # in that case we just emit the string body.
+ payload = msg.get_payload()
+ if isinstance(payload, list):
+ g.flatten(msg.get_payload(0), unixfrom=False)
+ payload = s.getvalue()
+ self._fp.write(payload)