diff --git a/Doc/library/io.rst b/Doc/library/io.rst index 543bb373c56..14f75066940 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -213,8 +213,10 @@ I/O Base Classes .. 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 internal + file descriptor isn't closed if *closefd* was False. .. attribute:: closed diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py index f28bade6c72..1f0295c1d46 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -272,6 +272,29 @@ class IOTest(unittest.TestCase): 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 @@ class MiscIOTest(unittest.TestCase): 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, diff --git a/Misc/NEWS b/Misc/NEWS index 7de06851fc0..f17e758aa37 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,11 @@ What's New in Python 3.0 beta 5 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. diff --git a/Modules/_fileio.c b/Modules/_fileio.c index a946ea51284..2cec2132235 100644 --- a/Modules/_fileio.c +++ b/Modules/_fileio.c @@ -61,10 +61,7 @@ static PyObject * 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); @@ -820,6 +817,12 @@ get_closed(PyFileIOObject *self, void *closure) return PyBool_FromLong((long)(self->fd < 0)); } +static PyObject * +get_closefd(PyFileIOObject *self, void *closure) +{ + return PyBool_FromLong((long)(self->closefd)); +} + static PyObject * get_mode(PyFileIOObject *self, void *closure) { @@ -828,6 +831,8 @@ get_mode(PyFileIOObject *self, void *closure) 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}, };