Issue #20520: Fixed readline test in test_codecs.
diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index 5c51ef5..76e6dbd 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -146,19 +146,20 @@
self.assertEqual(readalllines(s, True, 10), sexpected)
self.assertEqual(readalllines(s, False, 10), sexpectednoends)
+ lineends = ("\n", "\r\n", "\r", "\u2028")
# Test long lines (multiple calls to read() in readline())
vw = []
vwo = []
- for (i, lineend) in enumerate("\n \r\n \r \u2028".split()):
- vw.append((i*200)*"\3042" + lineend)
- vwo.append((i*200)*"\3042")
- self.assertEqual(readalllines("".join(vw), True), "".join(vw))
- self.assertEqual(readalllines("".join(vw), False),"".join(vwo))
+ for (i, lineend) in enumerate(lineends):
+ vw.append((i*200+200)*"\u3042" + lineend)
+ vwo.append((i*200+200)*"\u3042")
+ self.assertEqual(readalllines("".join(vw), True), "|".join(vw))
+ self.assertEqual(readalllines("".join(vw), False), "|".join(vwo))
# Test lines where the first read might end with \r, so the
# reader has to look ahead whether this is a lone \r or a \r\n
for size in range(80):
- for lineend in "\n \r\n \r \u2028".split():
+ for lineend in lineends:
s = 10*(size*"a" + lineend + "xxx\n")
reader = getreader(s)
for i in range(10):
@@ -166,12 +167,20 @@
reader.readline(keepends=True),
size*"a" + lineend,
)
+ self.assertEqual(
+ reader.readline(keepends=True),
+ "xxx\n",
+ )
reader = getreader(s)
for i in range(10):
self.assertEqual(
reader.readline(keepends=False),
size*"a",
)
+ self.assertEqual(
+ reader.readline(keepends=False),
+ "xxx",
+ )
def test_mixed_readline_and_read(self):
lines = ["Humpty Dumpty sat on a wall,\n",