mirror of https://github.com/python/cpython
#4841: Fix FileIO constructor to honor closefd when called repeatedly
Patch by Victor Stinner.
This commit is contained in:
parent
1a01ebc41c
commit
2cc7156515
|
@ -634,6 +634,19 @@ class IOTest(unittest.TestCase):
|
||||||
for obj in test:
|
for obj in test:
|
||||||
self.assertTrue(hasattr(obj, "__dict__"))
|
self.assertTrue(hasattr(obj, "__dict__"))
|
||||||
|
|
||||||
|
def test_fileio_closefd(self):
|
||||||
|
# Issue #4841
|
||||||
|
with self.open(__file__, 'rb') as f1, \
|
||||||
|
self.open(__file__, 'rb') as f2:
|
||||||
|
fileio = self.FileIO(f1.fileno(), closefd=False)
|
||||||
|
# .__init__() must not close f1
|
||||||
|
fileio.__init__(f2.fileno(), closefd=False)
|
||||||
|
f1.readline()
|
||||||
|
# .close() must not close f2
|
||||||
|
fileio.close()
|
||||||
|
f2.readline()
|
||||||
|
|
||||||
|
|
||||||
class CIOTest(IOTest):
|
class CIOTest(IOTest):
|
||||||
|
|
||||||
def test_IOBase_finalize(self):
|
def test_IOBase_finalize(self):
|
||||||
|
|
|
@ -227,9 +227,13 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
|
||||||
|
|
||||||
assert(PyFileIO_Check(oself));
|
assert(PyFileIO_Check(oself));
|
||||||
if (self->fd >= 0) {
|
if (self->fd >= 0) {
|
||||||
/* Have to close the existing file first. */
|
if (self->closefd) {
|
||||||
if (internal_close(self) < 0)
|
/* Have to close the existing file first. */
|
||||||
return -1;
|
if (internal_close(self) < 0)
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
self->fd = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|si:fileio",
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|si:fileio",
|
||||||
|
|
Loading…
Reference in New Issue