diff options
| author | Gregory P. Smith <greg@krypto.org> | 2012-06-24 07:23:47 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2012-06-24 07:23:47 (GMT) |
| commit | 990a5feba77de7fc5fd5ad5a16f61dc93667f63e (patch) | |
| tree | b0fdb65c20e4a233f59a60c4aa2081949a9cf441 /Modules/_io/bufferedio.c | |
| parent | 80d440aee198abc4077f7c30ecbf0a14e42c6eea (diff) | |
| parent | 5135992164f4c0df8d18d3b486431b28214db16b (diff) | |
| download | cpython-990a5feba77de7fc5fd5ad5a16f61dc93667f63e.zip cpython-990a5feba77de7fc5fd5ad5a16f61dc93667f63e.tar.gz cpython-990a5feba77de7fc5fd5ad5a16f61dc93667f63e.tar.bz2 | |
Fixes issue #12268: File readline, readlines and read() or readall() methods
no longer lose data when an underlying read system call is interrupted.
IOError is no longer raised due to a read system call returning EINTR
from within these methods.
Diffstat (limited to 'Modules/_io/bufferedio.c')
| -rw-r--r-- | Modules/_io/bufferedio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/_io/bufferedio.c b/Modules/_io/bufferedio.c index dc723b1..21393a3 100644 --- a/Modules/_io/bufferedio.c +++ b/Modules/_io/bufferedio.c @@ -746,8 +746,8 @@ _buffered_init(buffered *self) clears the error indicator), 0 otherwise. Should only be called when PyErr_Occurred() is true. */ -static int -_trap_eintr(void) +int +_PyIO_trap_eintr(void) { static PyObject *eintr_int = NULL; PyObject *typ, *val, *tb; @@ -1396,7 +1396,7 @@ _bufferedreader_raw_read(buffered *self, char *start, Py_ssize_t len) */ do { res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_readinto, memobj, NULL); - } while (res == NULL && _trap_eintr()); + } while (res == NULL && _PyIO_trap_eintr()); Py_DECREF(memobj); if (res == NULL) return -1; @@ -1850,7 +1850,7 @@ _bufferedwriter_raw_write(buffered *self, char *start, Py_ssize_t len) errno = 0; res = PyObject_CallMethodObjArgs(self->raw, _PyIO_str_write, memobj, NULL); errnum = errno; - } while (res == NULL && _trap_eintr()); + } while (res == NULL && _PyIO_trap_eintr()); Py_DECREF(memobj); if (res == NULL) return -1; |