mirror of https://github.com/python/cpython
gh-80361: Fix TypeError in email.Message.get_payload() (GH-117994)
It was raised when the charset is rfc2231 encoded, e.g.: Content-Type: text/plain; charset*=ansi-x3.4-1968''utf-8
This commit is contained in:
parent
c179c0e6cb
commit
deaecb88fa
|
@ -294,7 +294,7 @@ class Message:
|
||||||
try:
|
try:
|
||||||
bpayload = payload.encode('ascii', 'surrogateescape')
|
bpayload = payload.encode('ascii', 'surrogateescape')
|
||||||
try:
|
try:
|
||||||
payload = bpayload.decode(self.get_param('charset', 'ascii'), 'replace')
|
payload = bpayload.decode(self.get_content_charset('ascii'), 'replace')
|
||||||
except LookupError:
|
except LookupError:
|
||||||
payload = bpayload.decode('ascii', 'replace')
|
payload = bpayload.decode('ascii', 'replace')
|
||||||
except UnicodeEncodeError:
|
except UnicodeEncodeError:
|
||||||
|
|
|
@ -4181,6 +4181,21 @@ class Test8BitBytesHandling(TestEmailBase):
|
||||||
self.assertEqual(msg.get_payload(decode=True),
|
self.assertEqual(msg.get_payload(decode=True),
|
||||||
'<,.V<W1A; á \n'.encode('utf-8'))
|
'<,.V<W1A; á \n'.encode('utf-8'))
|
||||||
|
|
||||||
|
def test_rfc2231_charset_8bit_CTE(self):
|
||||||
|
m = textwrap.dedent("""\
|
||||||
|
From: foo@bar.com
|
||||||
|
To: baz
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset*=ansi-x3.4-1968''utf-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
pöstal
|
||||||
|
""").encode('utf-8')
|
||||||
|
msg = email.message_from_bytes(m)
|
||||||
|
self.assertEqual(msg.get_payload(), "pöstal\n")
|
||||||
|
self.assertEqual(msg.get_payload(decode=True),
|
||||||
|
"pöstal\n".encode('utf-8'))
|
||||||
|
|
||||||
|
|
||||||
headertest_headers = (
|
headertest_headers = (
|
||||||
('From: foo@bar.com', ('From', 'foo@bar.com')),
|
('From: foo@bar.com', ('From', 'foo@bar.com')),
|
||||||
|
|
|
@ -0,0 +1,2 @@
|
||||||
|
Fix TypeError in :func:`email.Message.get_payload` when the charset is :rfc:`2231`
|
||||||
|
encoded.
|
Loading…
Reference in New Issue