mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #23752: _Py_fstat() is now responsible to raise the Python exception

Browse source 
Add _Py_fstat_noraise() function when a Python exception is not welcome.
This commit is contained in:
Victor Stinner 2015-03-30 10:09:31 +02:00
parent 2e1c4e5db2
commit e134a7fe36
12 changed files with 89 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/signalmodule.c
View file

@ -503,7 +503,7 @@ signal_siginterrupt(PyObject *self, PyObject *args)
static PyObject *
signal_set_wakeup_fd(PyObject *self, PyObject *args)
{
struct _Py_stat_struct st;
struct _Py_stat_struct status;
#ifdef MS_WINDOWS
PyObject *fdobj;
SOCKET_T sockfd, old_sockfd;
@ -559,10 +559,8 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args)
return NULL;
}
if (_Py_fstat(fd, &st) != 0) {
PyErr_SetExcFromWindowsErr(PyExc_OSError, GetLastError());
if (_Py_fstat(fd, &status) != 0)
return NULL;
}
/* on Windows, a file cannot be set to non-blocking mode */
}
@ -591,10 +589,8 @@ signal_set_wakeup_fd(PyObject *self, PyObject *args)
return NULL;
}
if (_Py_fstat(fd, &st) != 0) {
PyErr_SetFromErrno(PyExc_OSError);
if (_Py_fstat(fd, &status) != 0)
return NULL;
}
blocking = _Py_get_blocking(fd);
if (blocking < 0)