Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Additional fix for Issue #12268: The io module file object writelines() methods 

no longer abort early when one of its write system calls is interrupted (EINTR).
This commit is contained in:
Gregory P. Smith 2013-02-01 13:02:59 -08:00
parent 608cc451c7
commit a998ad0135
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -679,6 +679,9 @@ Library
Extension Modules Extension Modules
----------------- -----------------
- Issue #12268: The io module file object writelines() methods no longer
abort early when one of its write system calls is interrupted (EINTR).
- Fix the leak of a dict in the time module when used in an embedded - Fix the leak of a dict in the time module when used in an embedded
interpreter that is repeatedly initialized and shutdown and reinitialized. interpreter that is repeatedly initialized and shutdown and reinitialized.

3
Modules/_io/iobase.c
View File

@ -660,7 +660,10 @@ iobase_writelines(PyObject *self, PyObject *args)
break; /* Stop Iteration */ break; /* Stop Iteration */
} }
res = NULL;
do {
res = PyObject_CallMethodObjArgs(self, _PyIO_str_write, line, NULL); res = PyObject_CallMethodObjArgs(self, _PyIO_str_write, line, NULL);
} while (res == NULL && _PyIO_trap_eintr());
Py_DECREF(line); Py_DECREF(line);
if (res == NULL) { if (res == NULL) {
Py_DECREF(iter); Py_DECREF(iter);

3
Modules/_io/textio.c
View File

@ -1213,8 +1213,11 @@ _textiowrapper_writeflush(textio *self)
Py_DECREF(pending); Py_DECREF(pending);
if (b == NULL) if (b == NULL)
return -1; return -1;
ret = NULL;
do {
ret = PyObject_CallMethodObjArgs(self->buffer, ret = PyObject_CallMethodObjArgs(self->buffer,
_PyIO_str_write, b, NULL); _PyIO_str_write, b, NULL);
} while (ret == NULL && _PyIO_trap_eintr());
Py_DECREF(b); Py_DECREF(b);
if (ret == NULL) if (ret == NULL)
return -1; return -1;