From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 30 Oct 2009 22:23:02 +0000 (+0000)
Subject: Merged revisions 75969 via svnmerge from
X-Git-Tag: v3.2a1~2270
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9257f5eecea74cb5d4bac858719584b0354b6d5d;p=python

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.
........
---

diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst
index 373b1b0836..cb624078ca 100644
--- a/Doc/library/_thread.rst
+++ b/Doc/library/_thread.rst
@@ -103,19 +103,6 @@ It defines the following constant and functions:
    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:
 
 
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 81e89845a4..fe63c4b6f2 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)