Remove official documentation entry for thread._count() and make the

docstring more descriptive instead.

diff --git a/Doc/library/thread.rst b/Doc/library/thread.rst
index ac9d1eb03033c6e408e1c6fb34afd29168d7bbb2..7e8d5c80d3589ff980825efffe74e46158bc1e0a 100644 (file)
--- a/Doc/library/thread.rst
+++ b/Doc/library/thread.rst
@@ -113,19 +113,6 @@ It defines the following constant and functions:
    .. versionadded:: 2.5
 
 
-.. function:: _count()
-
-   Return the number of currently running Python threads, excluding the main
-   thread.  The returned number comprises all threads created through
-   :func:`start_new_thread` as well as :class:`threading.Thread`, and not
-   yet finished.
-
-   This function is meant for internal and specialized purposes only. In
-   most applications :func:`threading.enumerate()` should be used instead.
-
-   .. versionadded:: 2.7
-
-
 Lock objects have the following methods:
 
 

diff --git a/Modules/threadmodule.c b/Modules/threadmodule.c
index c962c79f854659cdbe913cf6a7b8149eece733d1..c682af22ef23e51467d2a05a19d3d4f0a841d51b 100644 (file)
--- a/Modules/threadmodule.c
+++ b/Modules/threadmodule.c
@@ -616,8 +616,14 @@ thread__count(PyObject *self)
 PyDoc_STRVAR(_count_doc,
 "_count() -> integer\n\
 \n\
-Return the number of currently running (sub)threads.\n\
-This excludes the main thread.");
+\
+Return the number of currently running Python threads, excluding \n\
+the main thread. The returned number comprises all threads created\n\
+through `start_new_thread()` as well as `threading.Thread`, and not\n\
+yet finished.\n\
+\n\
+This function is meant for internal and specialized purposes only.\n\
+In most applications `threading.enumerate()` should be used instead.");
 
 static PyObject *
 thread_stack_size(PyObject *self, PyObject *args)