summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-03-31 01:42:34 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-03-31 01:42:34 (GMT)
commit702624ecf7fa0b7247b2bd07962db30d3e53885d (patch)
treec389876db74f1a7afc483556456f274778ba1059
parent3c7c355e67562aba62fbd84d91e0bd14660eeab8 (diff)
downloadcpython-702624ecf7fa0b7247b2bd07962db30d3e53885d.zip
cpython-702624ecf7fa0b7247b2bd07962db30d3e53885d.tar.gz
cpython-702624ecf7fa0b7247b2bd07962db30d3e53885d.tar.bz2
Issue #11393: Fix the documentation (cancel_dump_traceback_later)
* dump_traceback_later() => dump_tracebacks_later() * cancel_dump_traceback_later() => cancel_dump_tracebacks_later()
-rw-r--r--Doc/library/faulthandler.rst6
-rw-r--r--Modules/faulthandler.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/Doc/library/faulthandler.rst b/Doc/library/faulthandler.rst
index b203d37..34b4ed4 100644
--- a/Doc/library/faulthandler.rst
+++ b/Doc/library/faulthandler.rst
@@ -78,9 +78,9 @@ Dump the tracebacks after a timeout
This function is implemented using a watchdog thread, and therefore is
not available if Python is compiled with threads disabled.
-.. function:: cancel_dump_traceback_later()
+.. function:: cancel_dump_tracebacks_later()
- Cancel the last call to :func:`dump_traceback_later`.
+ Cancel the last call to :func:`dump_tracebacks_later`.
Dump the traceback on a user signal
@@ -105,7 +105,7 @@ Dump the traceback on a user signal
File descriptor issue
---------------------
-:func:`enable`, :func:`dump_traceback_later` and :func:`register` keep the
+:func:`enable`, :func:`dump_tracebacks_later` and :func:`register` keep the
file descriptor of their *file* argument. If the file is closed and its file
descriptor is reused by a new file, or if :func:`os.dup2` is used to replace
the file descriptor, the traceback will be written into a different file. Call
diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
index 751e8db..8ef998d 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -420,7 +420,7 @@ faulthandler_thread(void *unused)
}
static void
-faulthandler_cancel_dump_traceback_later(void)
+faulthandler_cancel_dump_tracebacks_later(void)
{
if (thread.running) {
/* Notify cancellation */
@@ -465,7 +465,7 @@ faulthandler_dump_traceback_later(PyObject *self,
return NULL;
/* Cancel previous thread, if running */
- faulthandler_cancel_dump_traceback_later();
+ faulthandler_cancel_dump_tracebacks_later();
Py_XDECREF(thread.file);
Py_INCREF(file);
@@ -493,9 +493,9 @@ faulthandler_dump_traceback_later(PyObject *self,
}
static PyObject*
-faulthandler_cancel_dump_traceback_later_py(PyObject *self)
+faulthandler_cancel_dump_tracebacks_later_py(PyObject *self)
{
- faulthandler_cancel_dump_traceback_later();
+ faulthandler_cancel_dump_tracebacks_later();
Py_RETURN_NONE;
}
#endif /* FAULTHANDLER_LATER */
@@ -799,7 +799,7 @@ static PyMethodDef module_methods[] = {
"dump the traceback of all threads in timeout seconds,\n"
"or each timeout seconds if repeat is True.")},
{"cancel_dump_tracebacks_later",
- (PyCFunction)faulthandler_cancel_dump_traceback_later_py, METH_NOARGS,
+ (PyCFunction)faulthandler_cancel_dump_tracebacks_later_py, METH_NOARGS,
PyDoc_STR("cancel_dump_tracebacks_later():\ncancel the previous call "
"to dump_tracebacks_later().")},
#endif
@@ -939,7 +939,7 @@ void _PyFaulthandler_Fini(void)
#ifdef FAULTHANDLER_LATER
/* later */
- faulthandler_cancel_dump_traceback_later();
+ faulthandler_cancel_dump_tracebacks_later();
if (thread.cancel_event) {
PyThread_free_lock(thread.cancel_event);
thread.cancel_event = NULL;