From: Christian Heimes <christian@cheimes.de>
Date: Wed, 5 Dec 2007 17:59:44 +0000 (+0000)
Subject: You are right, Guido. The newline argument is easier to use.
X-Git-Tag: v3.0a2~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecda261f59c4434fdc8a5b3eb329fbfb3d32ec9e;p=thirdparty%2FPython%2Fcpython.git

You are right, Guido. The newline argument is easier to use.
---

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 2f222aff3baf..f5b4a94578ec 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -525,16 +525,16 @@ class TextIOWrapperTest(unittest.TestCase):
         self.assertRaises(UnicodeError, t.write, "\xff")
         # (3) ignore
         b = io.BytesIO()
-        t = io.TextIOWrapper(b, encoding="ascii", errors="ignore")
+        t = io.TextIOWrapper(b, encoding="ascii", errors="ignore", newline="\n")
         t.write("abc\xffdef\n")
         t.flush()
-        self.assertEquals(b.getvalue(), b"abcdef" + os.linesep.encode())
+        self.assertEquals(b.getvalue(), b"abcdef\n")
         # (4) replace
         b = io.BytesIO()
-        t = io.TextIOWrapper(b, encoding="ascii", errors="replace")
+        t = io.TextIOWrapper(b, encoding="ascii", errors="replace", newline="\n")
         t.write("abc\xffdef\n")
         t.flush()
-        self.assertEquals(b.getvalue(), b"abc?def" + os.linesep.encode())
+        self.assertEquals(b.getvalue(), b"abc?def\n")
 
     def testNewlinesInput(self):
         testdata = b"AAA\nBBB\nCCC\rDDD\rEEE\r\nFFF\r\nGGG"