Merge: #19003: Only replace \r and/or \n line endings in email.generator.

This commit is contained in:
R David Murray 2016-09-11 17:23:33 -04:00
parent 727cc9337f
commit 29097d5a6a
2 changed files with 22 additions and 6 deletions

View file

@ -1599,6 +1599,18 @@ class TestMIMEApplication(unittest.TestCase):
self.assertEqual(msg.get_payload(), '\uFFFD' * len(bytesdata))
self.assertEqual(msg2.get_payload(decode=True), bytesdata)
def test_binary_body_with_unicode_linend_encode_noop(self):
# Issue 19003: This is a variation on #16564.
bytesdata = b'\x0b\xfa\xfb\xfc\xfd\xfe\xff'
msg = MIMEApplication(bytesdata, _encoder=encoders.encode_noop)
self.assertEqual(msg.get_payload(decode=True), bytesdata)
s = BytesIO()
g = BytesGenerator(s)
g.flatten(msg)
wireform = s.getvalue()
msg2 = email.message_from_bytes(wireform)
self.assertEqual(msg2.get_payload(decode=True), bytesdata)
def test_binary_body_with_encode_quopri(self):
# Issue 14360.
bytesdata = b'\xfa\xfb\xfc\xfd\xfe\xff '