mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

merge 3.3 (#16597)

Browse source
This commit is contained in:
Benjamin Peterson 2012-12-20 11:55:16 -06:00
commit 4c05969fc4
5 changed files with 80 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Modules/_io/bufferedio.c
View file

@ -484,7 +484,7 @@ buffered_closed_get(buffered *self, void *context)
static PyObject *
buffered_close(buffered *self, PyObject *args)
{
PyObject *res = NULL;
PyObject *res = NULL, *exc = NULL, *val, *tb;
int r;
CHECK_INITIALIZED(self)
@ -512,10 +512,10 @@ buffered_close(buffered *self, PyObject *args)
res = PyObject_CallMethodObjArgs((PyObject *)self, _PyIO_str_flush, NULL);
if (!ENTER_BUFFERED(self))
return NULL;
if (res == NULL) {
goto end;
}
Py_XDECREF(res);
if (res == NULL)
PyErr_Fetch(&exc, &val, &tb);
else
Py_DECREF(res);
res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_close, NULL);
@ -524,6 +524,22 @@ buffered_close(buffered *self, PyObject *args)
self->buffer = NULL;
}
if (exc != NULL) {
if (res != NULL) {
Py_CLEAR(res);
PyErr_Restore(exc, val, tb);
}
else {
PyObject *val2;
Py_DECREF(exc);
Py_XDECREF(tb);
PyErr_Fetch(&exc, &val2, &tb);
PyErr_NormalizeException(&exc, &val2, &tb);
PyException_SetContext(val2, val);
PyErr_Restore(exc, val2, tb);
}
}
end:
LEAVE_BUFFERED(self)
return res;