diff options
author | R David Murray <rdmurray@bitdance.com> | 2014-02-07 17:40:37 (GMT) |
---|---|---|
committer | R David Murray <rdmurray@bitdance.com> | 2014-02-07 17:40:37 (GMT) |
commit | 27e9de669be928b09d71fdd31f84da7b86f9a1fc (patch) | |
tree | 7a337c8b0a5b6f4ae0beb7c3e38b37aa61b21d33 /Lib/test/test_email | |
parent | 790202d61308efd3e7bc69cd61bff2306d789e57 (diff) | |
download | cpython-27e9de669be928b09d71fdd31f84da7b86f9a1fc.zip cpython-27e9de669be928b09d71fdd31f84da7b86f9a1fc.tar.gz cpython-27e9de669be928b09d71fdd31f84da7b86f9a1fc.tar.bz2 |
#20531: Revert e20f98a8ed71, the 3.4 version of the #19063 fix.
Diffstat (limited to 'Lib/test/test_email')
-rw-r--r-- | Lib/test/test_email/test_contentmanager.py | 5 | ||||
-rw-r--r-- | Lib/test/test_email/test_email.py | 52 |
2 files changed, 15 insertions, 42 deletions
diff --git a/Lib/test/test_email/test_contentmanager.py b/Lib/test/test_email/test_contentmanager.py index fa2d3d2..1629e2d 100644 --- a/Lib/test/test_email/test_contentmanager.py +++ b/Lib/test/test_email/test_contentmanager.py @@ -208,11 +208,12 @@ class TestRawDataManager(TestEmailBase): "Basìc tëxt.\n") def test_get_text_plain_utf8_base64_recoverable_bad_CTE_data(self): - m = self._bytes_msg(textwrap.dedent("""\ + m = self._str_msg(textwrap.dedent("""\ Content-Type: text/plain; charset="utf8" Content-Transfer-Encoding: base64 - QmFzw6xjIHTDq3h0Lgo""").encode('ascii') + b'\xFF=\n') + QmFzw6xjIHTDq3h0Lgo\xFF= + """)) self.assertEqual(raw_data_manager.get_content(m, errors='ignore'), "Basìc tëxt.\n") diff --git a/Lib/test/test_email/test_email.py b/Lib/test/test_email/test_email.py index acefb39..c66b524 100644 --- a/Lib/test/test_email/test_email.py +++ b/Lib/test/test_email/test_email.py @@ -92,44 +92,6 @@ class TestMessageAPI(TestEmailBase): msg.set_payload('This is a string payload', charset) self.assertEqual(msg.get_charset().input_charset, 'iso-8859-1') - def test_set_payload_with_8bit_data_and_charset(self): - data = b'\xd0\x90\xd0\x91\xd0\x92' - charset = Charset('utf-8') - msg = Message() - msg.set_payload(data, charset) - self.assertEqual(msg['content-transfer-encoding'], 'base64') - self.assertEqual(msg.get_payload(decode=True), data) - self.assertEqual(msg.get_payload(), '0JDQkdCS\n') - - def test_set_payload_with_non_ascii_and_charset_body_encoding_none(self): - data = b'\xd0\x90\xd0\x91\xd0\x92' - charset = Charset('utf-8') - charset.body_encoding = None # Disable base64 encoding - msg = Message() - msg.set_payload(data.decode('utf-8'), charset) - self.assertEqual(msg['content-transfer-encoding'], '8bit') - self.assertEqual(msg.get_payload(decode=True), data) - - def test_set_payload_with_8bit_data_and_charset_body_encoding_none(self): - data = b'\xd0\x90\xd0\x91\xd0\x92' - charset = Charset('utf-8') - charset.body_encoding = None # Disable base64 encoding - msg = Message() - msg.set_payload(data, charset) - self.assertEqual(msg['content-transfer-encoding'], '8bit') - self.assertEqual(msg.get_payload(decode=True), data) - - def test_set_payload_to_list(self): - msg = Message() - msg.set_payload([]) - self.assertEqual(msg.get_payload(), []) - - def test_set_payload_with_non_ascii_and_no_charset_raises(self): - data = b'\xd0\x90\xd0\x91\xd0\x92'.decode('utf-8') - msg = Message() - with self.assertRaises(TypeError): - msg.set_payload(data) - def test_get_charsets(self): eq = self.assertEqual @@ -596,10 +558,20 @@ class TestMessageAPI(TestEmailBase): self.assertIsInstance(msg.defects[0], errors.InvalidBase64CharactersDefect) + def test_broken_unicode_payload(self): + # This test improves coverage but is not a compliance test. + # The behavior in this situation is currently undefined by the API. + x = 'this is a br\xf6ken thing to do' + msg = Message() + msg['content-type'] = 'text/plain' + msg['content-transfer-encoding'] = '8bit' + msg.set_payload(x) + self.assertEqual(msg.get_payload(decode=True), + bytes(x, 'raw-unicode-escape')) + def test_questionable_bytes_payload(self): # This test improves coverage but is not a compliance test, - # since it involves poking inside the black box in a way - # that actually breaks the model invariants. + # since it involves poking inside the black box. x = 'this is a quéstionable thing to do'.encode('utf-8') msg = Message() msg['content-type'] = 'text/plain; charset="utf-8"' |