Skip to content

gh-154863: Check the encoded bytes in the shift state flush test #155128

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

Merged
serhiy-storchaka merged 2 commits into from
Aug 4, 2026
+9 −7
Merged

gh-154863: Check the encoded bytes in the shift state flush test #155128

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce1e701
gh-154863: Check the encoded bytes in the shift state flush test
serhiy-storchaka Aug 3, 2026
c81bc1d
Do not check the ASCII before the character on macOS 15
serhiy-storchaka Aug 3, 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
16 changes: 9 additions & 7 deletions Lib/test/test_codecs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3835,9 +3835,9 @@ def test_encode_shift_state_flush(self):
# ISO-2022-CN-EXT). That must not be read as a substituted character:
# doing so discarded the whole output, ASCII included.
#
# Only the ASCII around the character is checked, not a full round-trip.
# An iconv that cannot represent the character either rejects it or
# substitutes for it silently, as macOS does for ISO-2022-CN.
# Only the ASCII around the character is checked, in the encoded bytes:
# it is written there as is. An iconv that cannot represent the
# character rejects it or substitutes for it silently.
tested = False
for enc, text in _ICONV_SHIFT_STATE:
if not iconv_encoding_available(enc):
Expand All @@ -3848,10 +3848,12 @@ def test_encode_shift_state_flush(self):
except UnicodeEncodeError:
continue
tested = True
self.assertNotEqual(data, b'')
decoded = codecs.iconv_decode(enc, data, 'strict', True)[0]
self.assertStartsWith(decoded, 'ABC')
self.assertEndsWith(decoded, 'DEF')
# XXX macOS 15 encodes 'ABC\u4e2dDEF' to b'?DEF': the
# fallback character overwrites the ASCII before it.
#self.assertIn(b'ABC', data)
self.assertIn(b'DEF', data)
# Something was written for the character itself.
self.assertNotEqual(data, codecs.iconv_encode(enc, 'ABCDEF')[0])
if not tested:
self.skipTest('no shift-state iconv encoding is available')

Expand Down
Loading