summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2010-07-23 12:28:28 (GMT)
committerBrett Cannon <bcannon@gmail.com>2010-07-23 12:28:28 (GMT)
commitb0a3074d92cd31639ee985cf8293be9034f9b8bc (patch)
treee0e8c1b5c1ef3db556836a5368bc38802046764b /Doc
parentc14968f7f3cd55a29e31801e5e56d5525ae796ef (diff)
downloadcpython-b0a3074d92cd31639ee985cf8293be9034f9b8bc.zip
cpython-b0a3074d92cd31639ee985cf8293be9034f9b8bc.tar.gz
cpython-b0a3074d92cd31639ee985cf8293be9034f9b8bc.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 f642111..68d0304 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -299,8 +299,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.
.. attribute:: daemon