Skip to content

gh-150771: Fix email serialization for shift_jis and euc-jp #151120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bhuvi27 wants to merge 6 commits into
base: main
Choose a base branch
from
+34 −1
Open

gh-150771: Fix email serialization for shift_jis and euc-jp #151120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6795f58
gh-150771: Fix email serialization for shift_jis and euc-jp
bhuvi27 Jun 9, 2026
2f08540
Merge branch 'main' into gh-150771-fix-email-shift-jis-euc-jp
bhuvi27 Jun 10, 2026
24f6067
Merge branch 'main' into gh-150771-fix-email-shift-jis-euc-jp
bhuvi27 Jun 14, 2026
f6c53cb
gh-150771: Use output charset in set_text_content for shift_jis/euc-jp
bhuvi27 Jun 14, 2026
52810e5
Merge remote-tracking branch 'origin/gh-150771-fix-email-shift-jis-eu…
bhuvi27 Jun 14, 2026
e2f3984
gh-150771: Fix NEWS entry doc references for docs CI
bhuvi27 Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Lib/email/contentmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ def set_text_content(msg, string, subtype="plain", charset='utf-8', cte=None,
params=None, headers=None):
_prepare_set(msg, 'text', subtype, headers)

charset = email.charset.Charset(charset).input_charset
cs = email.charset.Charset(charset)
charset = cs.output_charset
cte, payload = _encode_text(string, charset, cte, msg.policy)
msg.set_payload(payload)
msg.set_param('charset', charset, replace=True)
Expand Down
28 changes: 28 additions & 0 deletions Lib/test/test_email/test_contentmanager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,34 @@ def test_set_text_charset_cp949(self):
self.assertEqual(m.get_payload(decode=True), content.encode('ks_c_5601-1987'))
self.assertEqual(m.get_content(), content)

def test_set_text_charset_shift_jis(self):
m = self._make_message()
content = "\u65e5\u672c\u8a9e\n"
raw_data_manager.set_content(m, content, charset='shift_jis')
self.assertEqual(m['Content-Type'], 'text/plain; charset="iso-2022-jp"')
self.assertEqual(m.get_payload(decode=True), content.encode('iso-2022-jp'))
self.assertEqual(m.get_content(), content)
self.assertEqual(str(m), textwrap.dedent("""\

@serhiy-storchaka serhiy-storchaka Jun 14, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add also assertions for bytes(m) similar to test_set_text_charset_cp949.

Content-Type: text/plain; charset="iso-2022-jp"
Content-Transfer-Encoding: 7bit
\x1b$BF|K\\8l\x1b(B
"""))

def test_set_text_charset_euc_jp(self):
m = self._make_message()
content = "\u65e5\u672c\u8a9e\n"
raw_data_manager.set_content(m, content, charset='euc-jp')
self.assertEqual(m['Content-Type'], 'text/plain; charset="iso-2022-jp"')
self.assertEqual(m.get_payload(decode=True), content.encode('iso-2022-jp'))
self.assertEqual(m.get_content(), content)
self.assertEqual(str(m), textwrap.dedent("""\
Content-Type: text/plain; charset="iso-2022-jp"
Content-Transfer-Encoding: 7bit
\x1b$BF|K\\8l\x1b(B
"""))

def test_set_text_plain_long_line_heuristics(self):
m = self._make_message()
content = ("Simple but long message that is over 78 characters"
Expand Down
4 changes: 4 additions & 0 deletions Misc/NEWS.d/next/Library/2026-06-09-12-00-00.gh-issue-150771.K7mNx2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Fix :mod:`email` messages created with ``shift_jis`` or ``euc-jp`` charsets.
``set_content()`` now stores the payload using the output charset
(``iso-2022-jp``) so printing the message no longer raises
:exc:`UnicodeEncodeError`.
Loading