mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 78276 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78276 | r.david.murray | 2010-02-20 23:39:40 -0500 (Sat, 20 Feb 2010) | 16 lines

  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.
  ........
................
This commit is contained in:
R. David Murray 2010-02-21 04:48:18 +00:00
parent 0e7e9aee59
commit d0a04ff95e
4 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/email/generator.py
View file

@ -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)