Merged revisions 77781-77782 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r77781 | benjamin.peterson | 2010-01-26 19:47:14 -0600 (Tue, 26 Jan 2010) | 1 line

  don't accept bytes in FileIO.write #7785
........
  r77782 | benjamin.peterson | 2010-01-26 19:51:29 -0600 (Tue, 26 Jan 2010) | 1 line

  add issue number
........

diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index d8f62253691f42ebd90392382a330dee45f63c01..7a9b7800fec3f59a65b698cad002ebc0a418a553 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))
@@ -170,7 +173,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 befc61c323b0ac9a153ea94dda3031b8b9855e70..2a66d01d199d281689364cff94ffa8e2e8de87a6 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -73,6 +73,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #7785: Don't accept bytes in FileIO.write().
+
 - Issue #7773: Fix an UnboundLocalError in platform.linux_distribution() when
   the release file is empty.
 

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 8162396a4225bd05e0196a0a0a05a027788ef62c..d04a74d6f8fee198d4906cac54b6438c8c39f2d7 100644 (file)
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -651,7 +651,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)) {