mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

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

24
Modules/_io/textio.c
View file

@ -2548,6 +2548,7 @@ textiowrapper_close(textio *self, PyObject *args)
Py_RETURN_NONE; /* stream already closed */
}
else {
PyObject *exc = NULL, *val, *tb;
if (self->deallocating) {
res = _PyObject_CallMethodId(self->buffer, &PyId__dealloc_warn, "O", self);
if (res)
@ -2556,13 +2557,28 @@ textiowrapper_close(textio *self, PyObject *args)
PyErr_Clear();
}
res = _PyObject_CallMethodId((PyObject *)self, &PyId_flush, NULL);
if (res == NULL) {
return NULL;
}
if (res == NULL)
PyErr_Fetch(&exc, &val, &tb);
else
Py_DECREF(res);
return _PyObject_CallMethodId(self->buffer, &PyId_close, NULL);
res = _PyObject_CallMethodId(self->buffer, &PyId_close, 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);
}
}
return res;
}
}