commit 371c307e565e8c5b9b64e5902c735e347fe0a051
author Benjamin Peterson <benjamin@python.org> Wed Jan 27 01:56:08 2010 +0000
committer Benjamin Peterson <benjamin@python.org> Wed Jan 27 01:56:08 2010 +0000
tree a600277d0e35c32ef2136f9c9f7c9783162407fe
parent 0a8f347fbc548930bcb610aec4bf6a4459bf7991

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
........

Lib/test/test_fileio.py

diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index d8f6225..7a9b780 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -78,6 +78,9 @@
         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 @@
 
     @ClosedFDRaises
     def testErrnoOnClosedWrite(self, f):
-        f.write('a')
+        f.write(b'a')
 
     @ClosedFDRaises
     def testErrnoOnClosedSeek(self, f):