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.
........
This commit is contained in:
Antoine Pitrou 2009-10-30 22:23:02 +00:00
parent aecd3b7718
commit 9257f5eece
2 changed files with 8 additions and 15 deletions

View File

@ -103,19 +103,6 @@ It defines the following constant and functions:
Availability: Windows, systems with POSIX threads. Availability: Windows, systems with POSIX threads.
.. 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:: 3.2
Lock objects have the following methods: Lock objects have the following methods:

View File

@ -616,8 +616,14 @@ thread__count(PyObject *self)
PyDoc_STRVAR(_count_doc, PyDoc_STRVAR(_count_doc,
"_count() -> integer\n\ "_count() -> integer\n\
\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 * static PyObject *
thread_stack_size(PyObject *self, PyObject *args) thread_stack_size(PyObject *self, PyObject *args)