mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #5700: io.FileIO() called flush() after closing the file.

Browse source 
flush() was not called in close() if closefd=False.
This commit is contained in:
Serhiy Storchaka 2015-02-21 00:35:53 +02:00
commit 254dd59068
3 changed files with 65 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Modules/_io/fileio.c
View file

@ -127,11 +127,18 @@ internal_close(fileio *self)
static PyObject *
fileio_close(fileio *self)
{
PyObject *res;
PyObject *exc, *val, *tb;
int rc;
_Py_IDENTIFIER(close);
res = _PyObject_CallMethodId((PyObject*)&PyRawIOBase_Type,
&PyId_close, "O", self);
if (!self->closefd) {
self->fd = -1;
Py_RETURN_NONE;
return res;
}
if (res == NULL)
PyErr_Fetch(&exc, &val, &tb);
if (self->finalizing) {
PyObject *r = fileio_dealloc_warn(self, (PyObject *) self);
if (r)
@ -139,12 +146,12 @@ fileio_close(fileio *self)
else
PyErr_Clear();
}
errno = internal_close(self);
if (errno < 0)
return NULL;
return _PyObject_CallMethodId((PyObject*)&PyRawIOBase_Type,
&PyId_close, "O", self);
rc = internal_close(self);
if (res == NULL)
_PyErr_ChainExceptions(exc, val, tb);
if (rc < 0)
Py_CLEAR(res);
return res;
}
static PyObject *