From b35c850a3f7e2e6d470bb9543b9ba83aa33047f7 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 13 Apr 2011 16:46:05 -0400 Subject: #11684: Complete parser bytes interface by adding BytesHeaderParser Patch by Steffen Daode Nurpmeso. --- Lib/email/generator.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Lib/email/generator.py') diff --git a/Lib/email/generator.py b/Lib/email/generator.py index f0e7a95477..fdd34e4ace 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -297,10 +297,12 @@ class Generator: # 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() + payload = msg._payload if isinstance(payload, list): g.flatten(msg.get_payload(0), unixfrom=False, linesep=self._NL) payload = s.getvalue() + else: + payload = self._encode(payload) self._fp.write(payload) # This used to be a module level function; we use a classmethod for this -- cgit v1.2.1