summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-05-11 18:19:27 (GMT)
committerGitHub <noreply@github.com>2021-05-11 18:19:27 (GMT)
commit7bef7a180da56e0399f4dec2c992bb101470fc73 (patch)
treec9d51dc802a6bd08d238a9d70db1fcfa209418a3
parent90904011bdfee38530918f6fb9f8fbcbe4e82f1c (diff)
downloadcpython-7bef7a180da56e0399f4dec2c992bb101470fc73.zip
cpython-7bef7a180da56e0399f4dec2c992bb101470fc73.tar.gz
cpython-7bef7a180da56e0399f4dec2c992bb101470fc73.tar.bz2
bpo-25821: Fix inaccuracy in threading.enumerate/is_alive documentation (GH-23192) (#26035)
(cherry picked from commit 12e7d10dfd28d4e26304e2c06b2e41c7418ec6f3) Co-authored-by: Irit Katriel <iritkatriel@yahoo.com>
-rw-r--r--Doc/library/threading.rst9
-rw-r--r--Lib/threading.py4
2 files changed, 7 insertions, 6 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 16f23c3..8c76643 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -121,10 +121,11 @@ This module defines the following functions:
.. function:: enumerate()
- Return a list of all :class:`Thread` objects currently alive. The list
- includes daemonic threads, dummy thread objects created by
- :func:`current_thread`, and the main thread. It excludes terminated threads
- and threads that have not yet been started.
+ Return a list of all :class:`Thread` objects currently active. The list
+ includes daemonic threads and dummy thread objects created by
+ :func:`current_thread`. It excludes terminated threads and threads
+ that have not yet been started. However, the main thread is always part
+ of the result, even when terminated.
.. function:: main_thread()
diff --git a/Lib/threading.py b/Lib/threading.py
index 4dcf847..fb70abd 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1130,8 +1130,8 @@ class Thread:
"""Return whether the thread is alive.
This method returns True just before the run() method starts until just
- after the run() method terminates. The module function enumerate()
- returns a list of all alive threads.
+ after the run() method terminates. See also the module function
+ enumerate().
"""
assert self._initialized, "Thread.__init__() not called"