languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-20 00:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Additional fix for issue #12268: The io module file object write methods no

Browse source 
longer abort early when a write system call is interrupted (EINTR).
This commit is contained in:
Gregory P. Smith 2013-02-01 13:08:23 -08:00
parent 193e1be72d b9817b01ed
commit 99ec7f6f3e
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Misc/NEWS
View file

@ -506,6 +506,12 @@ Library
- Issue #15906: Fix a regression in `argparse` caused by the preceding change,
when ``action='append'``, ``type='str'`` and ``default=[]``.
Extension Modules
-----------------
- Issue #12268: The io module file object write methods no longer abort early
when one of its write system calls is interrupted (EINTR).
Tests
-----

5
Modules/_io/iobase.c
View file

@ -669,7 +669,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);

7
Modules/_io/textio.c
View file

@ -1247,8 +1247,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;