Skip to content

Fix StringIO newline splitting and character positions #8351

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
doma17 wants to merge 3 commits into
base: main
Choose a base branch
from
+121 −88
Open

Fix StringIO newline splitting and character positions #8351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72b0543
Keep StringIO text operations CPython-compatible
doma17 Jul 23, 2026
b87b789
Run restored StringIO conformance tests
doma17 Jul 23, 2026
7c097b5
Keep StringIO newline handling consistent
doma17 Jul 23, 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
4 changes: 0 additions & 4 deletions Lib/test/test_email/test_email.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3812,7 +3812,6 @@ def test_typed_subpart_iterator_default_type(self):
-Me
""")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_pushCR_LF(self):
'''FeedParser BufferedSubFile.push() assumed it received complete
line endings. A CR ending one push() followed by a LF starting
Expand Down Expand Up @@ -3843,7 +3842,6 @@ def test_pushCR_LF(self):
self.assertEqual(len(om), nt)
self.assertEqual(''.join([il for il, n in imt]), ''.join(om))

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_push_random(self):
from email.feedparser import BufferedSubFile, NeedMoreData

Expand Down Expand Up @@ -3877,7 +3875,6 @@ def test_empty_header_name_handled(self):
self.assertEqual(msg['First'], 'val')
self.assertEqual(msg['Second'], 'val')

@unittest.expectedFailure # TODO: RUSTPYTHON; Feedparser.feed -> Feedparser._input.push, Feedparser._call_parse -> Feedparser._parse does not keep _input state between calls
def test_newlines(self):
m = self.parse(['a:\nb:\rc:\r\nd:\n'])
self.assertEqual(m.keys(), ['a', 'b', 'c', 'd'])
Expand All @@ -3896,7 +3893,6 @@ def test_newlines(self):
m = self.parse(['a:\r', 'b:\x85', 'c:\n'])
self.assertEqual(m.items(), [('a', ''), ('b', '\x85c:')])

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_long_lines(self):
# Expected peak memory use on 32-bit platform: 6*N*M bytes.
M, N = 1000, 20000
Expand Down
52 changes: 0 additions & 52 deletions Lib/test/test_memoryio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,6 @@ class CStringIOTest(PyStringIOTest):

# XXX: For the Python version of io.StringIO, this is highly
# dependent on the encoding used for the underlying buffer.
@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: 8 != 2
def test_widechar(self):
buf = self.buftype("\U0002030a\U00020347")
memio = self.ioclass(buf)
Expand All @@ -965,7 +964,6 @@ def test_getstate(self):
memio.close()
self.assertRaises(ValueError, memio.__getstate__)

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: ValueError not raised by __setstate__
def test_setstate(self):
# This checks whether __setstate__ does proper input validation.
memio = self.ioclass()
Expand Down Expand Up @@ -1002,22 +1000,6 @@ def __str__(self):
memio2.write(MyStr("world"))
self.assertEqual(memio2.getvalue(), "hello world")

@unittest.expectedFailure # TODO: RUSTPYTHON; +
def test_issue5265(self):
return super().test_issue5265()

@unittest.expectedFailure # TODO: RUSTPYTHON; ? ++++
def test_newline_empty(self):
return super().test_newline_empty()

@unittest.expectedFailure # TODO: RUSTPYTHON; ? ^^^^^
def test_newline_none(self):
return super().test_newline_none()

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: OSError not raised by seek
def test_relative_seek(self):
return super().test_relative_seek()

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: ValueError not raised by writable
def test_flags(self):
return super().test_flags()
Expand All @@ -1026,15 +1008,6 @@ def test_flags(self):
def test_newlines_property(self):
return super().test_newlines_property()

@unittest.expectedFailure # TODO: RUSTPYTHON; d
def test_newline_cr(self):
return super().test_newline_cr()

@unittest.expectedFailure # TODO: RUSTPYTHON; d
def test_newline_crlf(self):
return super().test_newline_crlf()


class CStringIOPickleTest(PyStringIOPickleTest):
UnsupportedOperation = io.UnsupportedOperation

Expand All @@ -1044,34 +1017,9 @@ def __new__(cls, *args, **kwargs):
def __init__(self, *args, **kwargs):
pass

@unittest.expectedFailure # TODO: RUSTPYTHON; +
def test_issue5265(self):
return super().test_issue5265()

@unittest.expectedFailure # TODO: RUSTPYTHON; ? ++++
def test_newline_empty(self):
return super().test_newline_empty()

@unittest.expectedFailure # TODO: RUSTPYTHON; ? ^^^^^
def test_newline_none(self):
return super().test_newline_none()

@unittest.expectedFailure # TODO: RUSTPYTHON; AssertionError: OSError not raised by seek
def test_relative_seek(self):
return super().test_relative_seek()

@unittest.expectedFailure # TODO: RUSTPYTHON; AttributeError: 'StringIO' object has no attribute 'newlines'. Did you mean: 'readlines'?
def test_newlines_property(self):
return super().test_newlines_property()

@unittest.expectedFailure # TODO: RUSTPYTHON; d
def test_newline_cr(self):
return super().test_newline_cr()

@unittest.expectedFailure # TODO: RUSTPYTHON; d
def test_newline_crlf(self):
return super().test_newline_crlf()


if __name__ == '__main__':
unittest.main()
4 changes: 0 additions & 4 deletions Lib/test/test_shlex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,10 @@ def testSplitNone(self):
with self.assertRaises(ValueError):
shlex.split(None)

@unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value
def testSplitPosix(self):
"""Test data splitting with posix parser"""
self.splitTest(self.posix_data, comments=True)

@unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value
def testCompat(self):
"""Test compatibility interface"""
for i in range(len(self.data)):
Expand Down Expand Up @@ -313,7 +311,6 @@ def testEmptyStringHandling(self):
s = shlex.shlex("'')abc", punctuation_chars=True)
self.assertEqual(list(s), expected)

@unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value
def testUnicodeHandling(self):
"""Test punctuation_chars and whitespace_split handle unicode."""
ss = "\u2119\u01b4\u2602\u210c\u00f8\u1f24"
Expand Down Expand Up @@ -356,7 +353,6 @@ def testJoin(self):
joined = shlex.join(split_command)
self.assertEqual(joined, command)

@unittest.expectedFailure # TODO: RUSTPYTHON; ValueError: Error Retrieving Value
def testJoinRoundtrip(self):
all_data = self.data + self.posix_data
for command, *split_command in all_data:
Expand Down
Loading
Loading