Browse Source

(Merge 3.4) Issue #25182: Fix compilation on Windows

pull/9921/head
Victor Stinner 10 years ago
parent
commit
ae86da9b20
  1. 9
      Objects/fileobject.c

9
Objects/fileobject.c

@ -376,7 +376,7 @@ stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
PyObject *bytes = NULL;
char *str;
Py_ssize_t n;
int _errno;
int err;
if (self->fd < 0) {
/* fd might be invalid on Windows
@ -403,10 +403,13 @@ stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
}
n = _Py_write(self->fd, str, n);
_errno = errno;
/* save errno, it can be modified indirectly by Py_XDECREF() */
err = errno;
Py_XDECREF(bytes);
if (n == -1) {
if (_errno == EAGAIN) {
if (err == EAGAIN) {
PyErr_Clear();
Py_RETURN_NONE;
}

Loading…
Cancel
Save