diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-07-24 20:51:05 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-07-24 20:51:05 (GMT) |
commit | 1d8948e02385a6a2431b3ca782cc64eb39bc8a26 (patch) | |
tree | e4017426e09abcf1fd5e4fbe2778fe126415f10d /Doc | |
parent | 31f1a360b8aa3b80c0f23ce0d3dee592d1afefd9 (diff) | |
download | cpython-1d8948e02385a6a2431b3ca782cc64eb39bc8a26.zip cpython-1d8948e02385a6a2431b3ca782cc64eb39bc8a26.tar.gz cpython-1d8948e02385a6a2431b3ca782cc64eb39bc8a26.tar.bz2 |
Backout 42ced0d023cd: oops, i didn't want to push this changeset :-/
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/c-api/exceptions.rst | 13 | ||||
-rw-r--r-- | Doc/library/signal.rst | 5 |
2 files changed, 3 insertions, 15 deletions
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst index 46033ca..33b4439 100644 --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -443,20 +443,13 @@ in various ways. There is a separate error indicator for each thread. .. c:function:: int PySignal_SetWakeupFd(int fd) - This utility function specifies a file descriptor to which the signal number - is written as a single byte whenever a signal is received. *fd* must be - non-blocking. It returns the previous such file descriptor. - - On Windows, the function only supports socket handles. - - The value ``-1`` disables the feature; this is the initial state. + This utility function specifies a file descriptor to which a ``'\0'`` byte will + be written whenever a signal is received. It returns the previous such file + descriptor. The value ``-1`` disables the feature; this is the initial state. This is equivalent to :func:`signal.set_wakeup_fd` in Python, but without any error checking. *fd* should be a valid file descriptor. The function should only be called from the main thread. - .. versionchanged:: 3.5 - On Windows, the function now only supports socket handles. - .. c:function:: PyObject* PyErr_NewException(char *name, PyObject *base, PyObject *dict) diff --git a/Doc/library/signal.rst b/Doc/library/signal.rst index cda228b..a97ce66 100644 --- a/Doc/library/signal.rst +++ b/Doc/library/signal.rst @@ -308,8 +308,6 @@ The :mod:`signal` module defines the following functions: a library to wakeup a poll or select call, allowing the signal to be fully processed. - On Windows, the function only supports socket handles. - The old wakeup fd is returned. *fd* must be non-blocking. It is up to the library to remove any bytes before calling poll or select again. @@ -320,9 +318,6 @@ The :mod:`signal` module defines the following functions: attempting to call it from other threads will cause a :exc:`ValueError` exception to be raised. - .. versionchanged:: 3.5 - On Windows, the function now only supports socket handles. - .. function:: siginterrupt(signalnum, flag) |