diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-09-28 14:48:40 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-09-28 14:48:40 (GMT) |
| commit | e56717c3d201db2dadacd20f654d6be7f9ed18ed (patch) | |
| tree | e0df9e7bf6ab16052edaa32311ab66278bc73404 /Lib/test/test_io.py | |
| parent | 19f6260710b3d086abcbe400194b203be11b60ab (diff) | |
| parent | d8b509b192a67f0f217ae52ed81fc91bc27a1818 (diff) | |
| download | cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.zip cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.gz cpython-e56717c3d201db2dadacd20f654d6be7f9ed18ed.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/test/test_io.py')
| -rw-r--r-- | Lib/test/test_io.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 2c502ab..117f8ab 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -1935,8 +1935,8 @@ class TextIOWrapperTest(unittest.TestCase): testdata = b"AAA\nBB\x00B\nCCC\rDDD\rEEE\r\nFFF\r\nGGG" normalized = testdata.replace(b"\r\n", b"\n").replace(b"\r", b"\n") for newline, expected in [ - (None, normalized.decode("ascii").splitlines(True)), - ("", testdata.decode("ascii").splitlines(True)), + (None, normalized.decode("ascii").splitlines(keepends=True)), + ("", testdata.decode("ascii").splitlines(keepends=True)), ("\n", ["AAA\n", "BB\x00B\n", "CCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]), ("\r\n", ["AAA\nBB\x00B\nCCC\rDDD\rEEE\r\n", "FFF\r\n", "GGG"]), ("\r", ["AAA\nBB\x00B\nCCC\r", "DDD\r", "EEE\r", "\nFFF\r", "\nGGG"]), |