Skip to content

Commit 9257f5e

Browse files
committed
Merged revisions 75969 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r75969 | antoine.pitrou | 2009-10-30 23:19:09 +0100 (ven., 30 oct. 2009) | 5 lines Remove official documentation entry for thread._count() and make the docstring more descriptive instead. ........
1 parent aecd3b7 commit 9257f5e

2 files changed

Lines changed: 8 additions & 15 deletions

File tree

Doc/library/_thread.rst

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,6 @@ It defines the following constant and functions:
103103
Availability: Windows, systems with POSIX threads.
104104

105105

106-
.. function:: _count()
107-
108-
Return the number of currently running Python threads, excluding the main
109-
thread. The returned number comprises all threads created through
110-
:func:`start_new_thread` as well as :class:`threading.Thread`, and not
111-
yet finished.
112-
113-
This function is meant for internal and specialized purposes only. In
114-
most applications :func:`threading.enumerate()` should be used instead.
115-
116-
.. versionadded:: 3.2
117-
118-
119106
Lock objects have the following methods:
120107

121108

Modules/_threadmodule.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,14 @@ thread__count(PyObject *self)
616616
PyDoc_STRVAR(_count_doc,
617617
"_count() -> integer\n\
618618
\n\
619-
Return the number of currently running (sub)threads.\n\
620-
This excludes the main thread.");
619+
\
620+
Return the number of currently running Python threads, excluding \n\
621+
the main thread. The returned number comprises all threads created\n\
622+
through `start_new_thread()` as well as `threading.Thread`, and not\n\
623+
yet finished.\n\
624+
\n\
625+
This function is meant for internal and specialized purposes only.\n\
626+
In most applications `threading.enumerate()` should be used instead.");
621627

622628
static PyObject *
623629
thread_stack_size(PyObject *self, PyObject *args)

0 commit comments

Comments
 (0)