summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2010-07-23 12:30:10 (GMT)
committerBrett Cannon <bcannon@gmail.com>2010-07-23 12:30:10 (GMT)
commit11a3061096cbaa64438008cedf6d97df5e569457 (patch)
tree4a390b9ba510c552b84543c910bdc0bf2330caf5 /Doc
parent21b44e0ea2f7af6efca3c8c91e40c820cf296f91 (diff)
downloadcpython-11a3061096cbaa64438008cedf6d97df5e569457.zip
cpython-11a3061096cbaa64438008cedf6d97df5e569457.tar.gz
cpython-11a3061096cbaa64438008cedf6d97df5e569457.tar.bz2
Merged revisions 83080 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83080 | brett.cannon | 2010-07-23 13:26:35 +0100 (Fri, 23 Jul 2010) | 5 lines Clarify the wording for threading.is_alive() to not suggest something is "roughly" done. Closes issue 9339. Thanks Brian Brazil for the patch. ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/threading.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index a0a1fdd..f18c959 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -319,8 +319,8 @@ impossible to detect the termination of alien threads.
Return whether the thread is alive.
- Roughly, a thread is alive from the moment the :meth:`start` method
- returns until its :meth:`run` method terminates. The module function
+ This method returns ``True`` just before the :meth:`run` method starts
+ until just after the :meth:`run` method terminates. The module function
:func:`.enumerate` returns a list of all alive threads.
.. method:: isDaemon()