diff -r 7ed8a9f9831d Lib/test/test_codecs.py --- a/Lib/test/test_codecs.py Wed Feb 05 13:42:29 2014 +0200 +++ b/Lib/test/test_codecs.py Wed Feb 05 15:05:06 2014 +0200 @@ -151,16 +151,16 @@ # 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(('\n', '\r\n', '\r', '\u2028')): + vw.append((1+i*200)*"\u3042" + lineend) + vwo.append((1+i*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 ('\n', '\r\n', '\r', '\u2028'): s = 10*(size*"a" + lineend + "xxx\n") reader = getreader(s) for i in range(10): @@ -168,12 +168,14 @@ 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",