don't accept bytes in FileIO.write #7785

diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index 4e6e1b59b493e60d63c866ed26a57998bb4de622..d35549f224477aa6a63709ba6fe4a47f943141e8 100644 (file)
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -78,6 +78,9 @@ class AutoFileTests(unittest.TestCase):
         self.assertEqual(self.f.readline(None), b"hi\n")
         self.assertEqual(self.f.readlines(None), [b"bye\n", b"abc"])
 
+    def test_reject(self):
+        self.assertRaises(TypeError, self.f.write, "Hello!")
+
     def testRepr(self):
         self.assertEquals(repr(self.f), "<_io.FileIO name=%r mode=%r>"
                                         % (self.f.name, self.f.mode))
@@ -168,7 +171,7 @@ class AutoFileTests(unittest.TestCase):
 
     @ClosedFDRaises
     def testErrnoOnClosedWrite(self, f):
-        f.write('a')
+        f.write(b'a')
 
     @ClosedFDRaises
     def testErrnoOnClosedSeek(self, f):

diff --git a/Misc/NEWS b/Misc/NEWS
index 2e12ffef08f16bd2deec32267d6a54c5b89418a2..c5d0e47a6994542751205b740dee19353f9a0275 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,8 @@ C-API
 Library
 -------
 
+- Don't accept bytes in FileIO.write().
+
 - Removed the functions 'verify' and 'vereq' from Lib/test/support.py.
 
 - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 37ddaebee4de8740e33929bf11547908ef809651..f02fe8a6e6bd9c6310dc122d02676ebc970e500a 100644 (file)
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -648,7 +648,7 @@ fileio_write(fileio *self, PyObject *args)
        if (!self->writable)
                return err_mode("writing");
 
-       if (!PyArg_ParseTuple(args, "s*", &pbuf))
+       if (!PyArg_ParseTuple(args, "y*", &pbuf))
                return NULL;
 
        if (_PyVerify_fd(self->fd)) {