From 2b08b38deacc065b4fea8421528de1eed66d56b0 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 8 May 2007 20:18:39 +0000 Subject: [PATCH] Fix a few places where a str instead of a bytes object was used. --- Lib/io.py | 2 +- Lib/test/test_io.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/io.py b/Lib/io.py index 2b85da72cf..4ac4e45b5f 100644 --- a/Lib/io.py +++ b/Lib/io.py @@ -1047,7 +1047,7 @@ class TextIOWrapper(TextIOBase): return self._encode_decoder_state(decoder_state, position) saved_state = decoder.getstate() try: - decoder.setstate(("", decoder_state)) + decoder.setstate((b"", decoder_state)) n = 0 bb = bytes(1) for i, bb[0] in enumerate(readahead): diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index 957ce299e1..d1c0f68b43 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -87,9 +87,9 @@ class IOTest(unittest.TestCase): self.assertEqual(f.tell(), 6) self.assertEqual(f.seek(-1, 1), 5) self.assertEqual(f.tell(), 5) - self.assertEqual(f.write(" world\n\n\n"), 9) + self.assertEqual(f.write(str8(" world\n\n\n")), 9) self.assertEqual(f.seek(0), 0) - self.assertEqual(f.write("h"), 1) + self.assertEqual(f.write(b"h"), 1) self.assertEqual(f.seek(-1, 2), 13) self.assertEqual(f.tell(), 13) self.assertEqual(f.truncate(12), 12) @@ -230,7 +230,7 @@ class IOTest(unittest.TestCase): def test_close_flushes(self): f = io.open(test_support.TESTFN, "wb") - f.write("xxx") + f.write(b"xxx") f.close() f = io.open(test_support.TESTFN, "rb") self.assertEqual(f.read(), b"xxx") @@ -595,7 +595,7 @@ class TextIOWrapperTest(unittest.TestCase): f.close() f = io.open(test_support.TESTFN, "r", encoding="utf-8") s = f.read(prefix_size) - self.assertEquals(s, prefix) + self.assertEquals(s, str(prefix)) self.assertEquals(f.tell(), prefix_size) self.assertEquals(f.readline(), u_suffix) -- 2.50.1