Index: Misc/NEWS =================================================================== --- Misc/NEWS (Revision 67105) +++ Misc/NEWS (Arbeitskopie) @@ -15,6 +15,11 @@ Core and Builtins ----------------- +- Issue #4233: Changed semantic of ``_fileio.FileIO``'s ``close()`` + method on file objects with closefd=False. The file descriptor is still + kept open but the file object behaves like a closed file. The ``FileIO`` + object also got a new readonly attribute ``closefd``. + - Issue #3626: On cygwin, starting python with a non-existent script name would not display anything if the file name is only 1 character long. Index: Doc/library/io.rst =================================================================== --- Doc/library/io.rst (Revision 67105) +++ Doc/library/io.rst (Arbeitskopie) @@ -213,8 +213,10 @@ .. method:: close() - Flush and close this stream. This method has no effect if the file is - already closed. + Flush and close this stream. This method has no effect if the file is + already closed. Once the file is closed, any operation on the file + (e.g. reading or writing) will raise an :exc:`IOError`.The the internal + file descriptor isn't closed if *closefd* was False. .. attribute:: closed Index: Lib/test/test_io.py =================================================================== --- Lib/test/test_io.py (Revision 67105) +++ Lib/test/test_io.py (Arbeitskopie) @@ -272,6 +272,29 @@ self.assertRaises(ValueError, io.open, support.TESTFN, 'w', closefd=False) + def testReadClosed(self): + with io.open(support.TESTFN, "w") as f: + f.write("egg\n") + with io.open(support.TESTFN, "r") as f: + file = io.open(f.fileno(), "r", closefd=False) + self.assertEqual(file.read(), "egg\n") + file.seek(0) + file.close() + self.assertRaises(ValueError, file.read) + + def test_no_closefd_with_filename(self): + # can't use closefd in combination with a file name + self.assertRaises(ValueError, io.open, support.TESTFN, "r", closefd=False) + + def test_closefd_attr(self): + with io.open(support.TESTFN, "wb") as f: + f.write(b"egg\n") + with io.open(support.TESTFN, "r") as f: + self.assertEqual(f.buffer.raw.closefd, True) + file = io.open(f.fileno(), "r", closefd=False) + self.assertEqual(file.buffer.raw.closefd, False) + + class MemorySeekTestMixin: def testInit(self): @@ -1237,15 +1260,6 @@ else: self.assert_(issubclass(obj, io.IOBase)) - def test_fileio_warnings(self): - with support.check_warnings() as w: - self.assertEqual(w.warnings, []) - self.assertRaises(TypeError, io.FileIO, []) - self.assertEqual(w.warnings, []) - self.assertRaises(ValueError, io.FileIO, "/some/invalid/name", "rt") - self.assertEqual(w.warnings, []) - - def test_main(): support.run_unittest(IOTest, BytesIOTest, StringIOTest, BufferedReaderTest, BufferedWriterTest, Index: Modules/_fileio.c =================================================================== --- Modules/_fileio.c (Revision 67105) +++ Modules/_fileio.c (Arbeitskopie) @@ -61,10 +61,7 @@ fileio_close(PyFileIOObject *self) { if (!self->closefd) { - if (PyErr_WarnEx(PyExc_RuntimeWarning, - "Trying to close unclosable fd!", 3) < 0) { - return NULL; - } + self->fd = -1; Py_RETURN_NONE; } errno = internal_close(self); @@ -821,6 +818,12 @@ } static PyObject * +get_closefd(PyFileIOObject *self, void *closure) +{ + return PyBool_FromLong((long)(self->closefd)); +} + +static PyObject * get_mode(PyFileIOObject *self, void *closure) { return PyUnicode_FromString(mode_string(self)); @@ -828,6 +831,8 @@ static PyGetSetDef fileio_getsetlist[] = { {"closed", (getter)get_closed, NULL, "True if the file is closed"}, + {"closefd", (getter)get_closefd, NULL, + "True if the file descriptor will be closed"}, {"mode", (getter)get_mode, NULL, "String giving the file mode"}, {0}, };