diff options
| -rw-r--r-- | Lib/email/encoders.py | 6 | ||||
| -rw-r--r-- | Lib/email/generator.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_email/test_email.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
4 files changed, 28 insertions, 0 deletions
diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py index e5c099f..88b2f57 100644 --- a/Lib/email/encoders.py +++ b/Lib/email/encoders.py @@ -76,3 +76,9 @@ def encode_7or8bit(msg): def encode_noop(msg): """Do nothing.""" + # Well, not quite *nothing*: in Python3 we have to turn bytes into a string + # in our internal surrogateescaped form in order to keep the model + # consistent. + orig = msg.get_payload() + if not isinstance(orig, str): + msg.set_payload(orig.decode('ascii', 'surrogateescape')) diff --git a/Lib/email/generator.py b/Lib/email/generator.py index 899adbc..de9da39 100644 --- a/Lib/email/generator.py +++ b/Lib/email/generator.py @@ -406,6 +406,9 @@ class BytesGenerator(Generator): else: super(BytesGenerator,self)._handle_text(msg) + # Default body handler + _writeBody = _handle_text + @classmethod def _compile_re(cls, s, flags): return re.compile(s.encode('ascii'), flags) diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index da7cb53..54f7214 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -1440,6 +1440,22 @@ class TestMIMEApplication(unittest.TestCase): eq(msg.get_payload().strip(), '+vv8/f7/') eq(msg.get_payload(decode=True), bytesdata) + def test_body_with_encode_noop(self): + # Issue 16564: This does not produce an RFC valid message, since to be + # valid it should have a CTE of binary. But the below works in + # Python2, and is documented as working this way. + bytesdata = b'\xfa\xfb\xfc\xfd\xfe\xff' + msg = MIMEApplication(bytesdata, _encoder=encoders.encode_noop) + # Treated as a string, this will be invalid code points. + self.assertEqual(msg.get_payload(), '\uFFFD' * len(bytesdata)) + 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(msg.get_payload(), '\uFFFD' * len(bytesdata)) + self.assertEqual(msg2.get_payload(decode=True), bytesdata) # Test the basic MIMEText class @@ -169,6 +169,9 @@ Core and Builtins Library ------- +- Issue #16564: Fixed regression relative to Python2 in the operation of + email.encoders.encode_noop when used with binary data. + - Issue #10355: In SpooledTemporaryFile class mode, name, encoding and newlines properties now work for unrolled files. Obsoleted and never working on Python 3 xreadline method now removed. |