Commit 2b08b38d authored by Guido van Rossum's avatar Guido van Rossum

Fix a few places where a str instead of a bytes object was used.

parent 57b93ad5
...@@ -1047,7 +1047,7 @@ class TextIOWrapper(TextIOBase): ...@@ -1047,7 +1047,7 @@ class TextIOWrapper(TextIOBase):
return self._encode_decoder_state(decoder_state, position) return self._encode_decoder_state(decoder_state, position)
saved_state = decoder.getstate() saved_state = decoder.getstate()
try: try:
decoder.setstate(("", decoder_state)) decoder.setstate((b"", decoder_state))
n = 0 n = 0
bb = bytes(1) bb = bytes(1)
for i, bb[0] in enumerate(readahead): for i, bb[0] in enumerate(readahead):
......
...@@ -87,9 +87,9 @@ class IOTest(unittest.TestCase): ...@@ -87,9 +87,9 @@ class IOTest(unittest.TestCase):
self.assertEqual(f.tell(), 6) self.assertEqual(f.tell(), 6)
self.assertEqual(f.seek(-1, 1), 5) self.assertEqual(f.seek(-1, 1), 5)
self.assertEqual(f.tell(), 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.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.seek(-1, 2), 13)
self.assertEqual(f.tell(), 13) self.assertEqual(f.tell(), 13)
self.assertEqual(f.truncate(12), 12) self.assertEqual(f.truncate(12), 12)
...@@ -230,7 +230,7 @@ class IOTest(unittest.TestCase): ...@@ -230,7 +230,7 @@ class IOTest(unittest.TestCase):
def test_close_flushes(self): def test_close_flushes(self):
f = io.open(test_support.TESTFN, "wb") f = io.open(test_support.TESTFN, "wb")
f.write("xxx") f.write(b"xxx")
f.close() f.close()
f = io.open(test_support.TESTFN, "rb") f = io.open(test_support.TESTFN, "rb")
self.assertEqual(f.read(), b"xxx") self.assertEqual(f.read(), b"xxx")
...@@ -595,7 +595,7 @@ class TextIOWrapperTest(unittest.TestCase): ...@@ -595,7 +595,7 @@ class TextIOWrapperTest(unittest.TestCase):
f.close() f.close()
f = io.open(test_support.TESTFN, "r", encoding="utf-8") f = io.open(test_support.TESTFN, "r", encoding="utf-8")
s = f.read(prefix_size) s = f.read(prefix_size)
self.assertEquals(s, prefix) self.assertEquals(s, str(prefix))
self.assertEquals(f.tell(), prefix_size) self.assertEquals(f.tell(), prefix_size)
self.assertEquals(f.readline(), u_suffix) self.assertEquals(f.readline(), u_suffix)
......
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