diff options
| author | Gregory P. Smith <greg@krypto.org> | 2013-02-01 21:03:39 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2013-02-01 21:03:39 (GMT) |
| commit | b9817b01edfe6fa369c4c291a5de00732b8abc7c (patch) | |
| tree | 6c6c6482442bfc0718bba8deb8c5e08f5d7034e9 /Modules | |
| parent | b47acbf46abd425f69dcc03e9b4f0c7f7c321ac2 (diff) | |
| download | cpython-b9817b01edfe6fa369c4c291a5de00732b8abc7c.zip cpython-b9817b01edfe6fa369c4c291a5de00732b8abc7c.tar.gz cpython-b9817b01edfe6fa369c4c291a5de00732b8abc7c.tar.bz2 | |
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).
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_io/iobase.c | 5 | ||||
| -rw-r--r-- | Modules/_io/textio.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index ba86146..8b17ecd 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -674,7 +674,10 @@ iobase_writelines(PyObject *self, PyObject *args) break; /* Stop Iteration */ } - res = PyObject_CallMethodObjArgs(self, _PyIO_str_write, line, NULL); + res = NULL; + do { + res = PyObject_CallMethodObjArgs(self, _PyIO_str_write, line, NULL); + } while (res == NULL && _PyIO_trap_eintr()); Py_DECREF(line); if (res == NULL) { Py_DECREF(iter); diff --git a/Modules/_io/textio.c b/Modules/_io/textio.c index 2fbb8f3..7d48388 100644 --- a/Modules/_io/textio.c +++ b/Modules/_io/textio.c @@ -1249,8 +1249,11 @@ _textiowrapper_writeflush(textio *self) Py_DECREF(pending); if (b == NULL) return -1; - ret = PyObject_CallMethodObjArgs(self->buffer, - _PyIO_str_write, b, NULL); + ret = NULL; + do { + ret = PyObject_CallMethodObjArgs(self->buffer, + _PyIO_str_write, b, NULL); + } while (ret == NULL && _PyIO_trap_eintr()); Py_DECREF(b); if (ret == NULL) return -1; |