diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/email/generator.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_email/test_email.py | 24 |
2 files changed, 27 insertions, 0 deletions
diff --git a/Lib/email/generator.py b/Lib/email/generator.py index d8b8fa9..edba13f 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -386,6 +386,9 @@ class BytesGenerator(Generator): h = Header(v, charset=_charset.UNKNOWN8BIT, header_name=h) else: h = Header(v, header_name=h) + else: + # Assume it is a Header-like object. + h = v self.write(h.encode(linesep=self._NL, maxlinelen=self._maxheaderlen)+self._NL) # A blank line always separates headers from body diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index a4d39ab..1f354c2 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -3601,6 +3601,30 @@ class Test8BitBytesHandling(unittest.TestCase): g.flatten(msg) self.assertEqual(s.getvalue(), source) + def test_bytes_generator_b_encoding_linesep(self): + # Issue 14062: b encoding was tacking on an extra \n. + m = Message() + # This has enough non-ascii that it should always end up b encoded. + m['Subject'] = Header('žluťoučký kůň') + s = BytesIO() + g = email.generator.BytesGenerator(s) + g.flatten(m, linesep='\r\n') + self.assertEqual( + s.getvalue(), + b'Subject: =?utf-8?b?xb5sdcWlb3XEjWvDvSBrxa/FiA==?=\r\n\r\n') + + def test_generator_b_encoding_linesep(self): + # Since this broke in ByteGenerator, test Generator for completeness. + m = Message() + # This has enough non-ascii that it should always end up b encoded. + m['Subject'] = Header('žluťoučký kůň') + s = StringIO() + g = email.generator.Generator(s) + g.flatten(m, linesep='\r\n') + self.assertEqual( + s.getvalue(), + 'Subject: =?utf-8?b?xb5sdcWlb3XEjWvDvSBrxa/FiA==?=\r\n\r\n') + def test_crlf_control_via_policy(self): # msg_26 is crlf terminated with openfile('msg_26.txt', 'rb') as fp: |