[Python-checkins] r75969 - in python/trunk: Doc/library/thread.rst Modules/threadmodule.c

[antoine.pitrou]

Author: antoine.pitrou
Date: Fri Oct 30 23:19:09 2009
New Revision: 75969

Log:
Remove official documentation entry for thread._count() and make the
docstring more descriptive instead.




Modified:
   python/trunk/Doc/library/thread.rst
   python/trunk/Modules/threadmodule.c

Modified: python/trunk/Doc/library/thread.rst
==============================================================================
--- python/trunk/Doc/library/thread.rst	(original)
+++ python/trunk/Doc/library/thread.rst	Fri Oct 30 23:19:09 2009
@@ -113,19 +113,6 @@
    .. 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:
 
 

Modified: python/trunk/Modules/threadmodule.c
==============================================================================
--- python/trunk/Modules/threadmodule.c	(original)
+++ python/trunk/Modules/threadmodule.c	Fri Oct 30 23:19:09 2009
@@ -616,8 +616,14 @@
 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)