summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-10-30 22:23:02 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-10-30 22:23:02 (GMT)
commit9257f5eecea74cb5d4bac858719584b0354b6d5d (patch)
treed7b9cbf9c8578e6f076ae75e27accb952733c44a /Modules
parentaecd3b77184f5a9a16a26cec39a532a50f1ab191 (diff)
downloadcpython-9257f5eecea74cb5d4bac858719584b0354b6d5d.zip
cpython-9257f5eecea74cb5d4bac858719584b0354b6d5d.tar.gz
cpython-9257f5eecea74cb5d4bac858719584b0354b6d5d.tar.bz2
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. ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_threadmodule.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 81e8984..fe63c4b 100644
--- 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)