mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge

Browse source
This commit is contained in:
Antoine Pitrou 2015-03-20 00:10:23 +01:00
commit 484b9f3b99
7 changed files with 221 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Objects/fileobject.c
View file

@ -383,26 +383,15 @@ stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
Py_RETURN_NONE;
}
if (!PyArg_ParseTuple(args, "s", &c)) {
if (!PyArg_ParseTuple(args, "s", &c))
return NULL;
}
n = strlen(c);
Py_BEGIN_ALLOW_THREADS
errno = 0;
#ifdef MS_WINDOWS
if (n > INT_MAX)
n = INT_MAX;
n = write(self->fd, c, (int)n);
#else
n = write(self->fd, c, n);
#endif
Py_END_ALLOW_THREADS
if (n < 0) {
if (errno == EAGAIN)
n = _Py_write(self->fd, c, strlen(c));
if (n == -1) {
if (errno == EAGAIN) {
PyErr_Clear();
Py_RETURN_NONE;
PyErr_SetFromErrno(PyExc_IOError);
}
return NULL;
}