gh-76511: Fix email.Message.as_string() for non-ASCII message with ASCII charset (GH-116125)

This commit is contained in:
Serhiy Storchaka 2024-03-05 17:49:01 +02:00 committed by GitHub
parent df59401108
commit f97f25ef5d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 21 additions and 2 deletions

View file

@ -340,7 +340,7 @@ class Message:
return
if not isinstance(charset, Charset):
charset = Charset(charset)
payload = payload.encode(charset.output_charset)
payload = payload.encode(charset.output_charset, 'surrogateescape')
if hasattr(payload, 'decode'):
self._payload = payload.decode('ascii', 'surrogateescape')
else: