diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-08 00:27:06 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-07-08 00:27:06 (GMT) |
| commit | 2b49f12a636694bb880127901a43d821dec8a094 (patch) | |
| tree | e66c7bf18fedbf41335a09cff75fd011e1a07d42 | |
| parent | 2cded9c3f31d2fea4b033f44eaa828e508f03391 (diff) | |
| parent | 6e2e3b9e8188acca0d40df365f3d9595fad59991 (diff) | |
| download | cpython-2b49f12a636694bb880127901a43d821dec8a094.zip cpython-2b49f12a636694bb880127901a43d821dec8a094.tar.gz cpython-2b49f12a636694bb880127901a43d821dec8a094.tar.bz2 | |
(merge 3.2) Issue #12423: Fix os.abort() documentation
The Python signal handler for SIGABRT is not called on os.abort() (only if the
signal is raised manually or sent by another process). Patch by Kamil Kisiel.
| -rw-r--r-- | Doc/ACKS.txt | 3 | ||||
| -rw-r--r-- | Doc/library/os.rst | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt index 755f647..e68826c 100644 --- a/Doc/ACKS.txt +++ b/Doc/ACKS.txt @@ -105,6 +105,7 @@ docs@python.org), and we'll be glad to correct the problem. * Robert Kern * Jim Kerr * Jan Kim + * Kamil Kisiel * Greg Kochanski * Guido Kollerie * Peter A. Koren @@ -142,7 +143,7 @@ docs@python.org), and we'll be glad to correct the problem. * Ross Moore * Sjoerd Mullender * Dale Nagata - * Michal Nowikowski + * Michal Nowikowski * Ng Pheng Siong * Koray Oner * Tomas Oppelstrup diff --git a/Doc/library/os.rst b/Doc/library/os.rst index 2cdd102..447fa2e 100644 --- a/Doc/library/os.rst +++ b/Doc/library/os.rst @@ -2088,8 +2088,9 @@ to be ignored. Generate a :const:`SIGABRT` signal to the current process. On Unix, the default behavior is to produce a core dump; on Windows, the process immediately returns - an exit code of ``3``. Be aware that programs which use :func:`signal.signal` - to register a handler for :const:`SIGABRT` will behave differently. + an exit code of ``3``. Be aware that calling this function will not call the + Python signal handler registered for :const:`SIGABRT` with + :func:`signal.signal`. Availability: Unix, Windows. |