Commit 1836358c authored by Guido van Rossum's avatar Guido van Rossum

Fix an unfinished though in my own test code.

(testNewlinesInput and testNewlinesOutput are mine, not Tony's.)
parent 8358db22
...@@ -571,29 +571,31 @@ class TextIOWrapperTest(unittest.TestCase): ...@@ -571,29 +571,31 @@ class TextIOWrapperTest(unittest.TestCase):
self.assertEquals(txt.read(), "".join(expected)) self.assertEquals(txt.read(), "".join(expected))
def testNewlinesOutput(self): def testNewlinesOutput(self):
import os
orig_linesep = os.linesep
data = "AAA\nBBB\rCCC\n" data = "AAA\nBBB\rCCC\n"
data_lf = b"AAA\nBBB\rCCC\n" data_lf = b"AAA\nBBB\rCCC\n"
data_cr = b"AAA\rBBB\rCCC\r" data_cr = b"AAA\rBBB\rCCC\r"
data_crlf = b"AAA\r\nBBB\rCCC\r\n" data_crlf = b"AAA\r\nBBB\rCCC\r\n"
for os.linesep, newline, expected in [ save_linesep = os.linesep
("\n", None, data_lf), try:
("\r\n", None, data_crlf), for os.linesep, newline, expected in [
("\n", "", data_lf), ("\n", None, data_lf),
("\r\n", "", data_lf), ("\r\n", None, data_crlf),
("\n", "\n", data_lf), ("\n", "", data_lf),
("\r\n", "\n", data_lf), ("\r\n", "", data_lf),
("\n", "\r", data_cr), ("\n", "\n", data_lf),
("\r\n", "\r", data_cr), ("\r\n", "\n", data_lf),
("\n", "\r\n", data_crlf), ("\n", "\r", data_cr),
("\r\n", "\r\n", data_crlf), ("\r\n", "\r", data_cr),
]: ("\n", "\r\n", data_crlf),
buf = io.BytesIO() ("\r\n", "\r\n", data_crlf),
txt = io.TextIOWrapper(buf, encoding="ASCII", newline=newline) ]:
txt.write(data) buf = io.BytesIO()
txt.close() txt = io.TextIOWrapper(buf, encoding="ASCII", newline=newline)
self.assertEquals(buf.getvalue(), expected) txt.write(data)
txt.close()
self.assertEquals(buf.getvalue(), expected)
finally:
os.linesep = save_linesep
# Systematic tests of the text I/O API # Systematic tests of the text I/O API
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment