From: Irit Katriel <iritkatriel@yahoo.com>
Date: Tue, 11 May 2021 17:55:24 +0000 (+0100)
Subject: bpo-25821: Fix inaccuracy in threading.enumerate/is_alive documentation (#23192)
X-Git-Tag: v3.11.0a1~1160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12e7d10dfd28d4e26304e2c06b2e41c7418ec6f3;p=thirdparty%2FPython%2Fcpython.git

bpo-25821: Fix inaccuracy in threading.enumerate/is_alive documentation (#23192)
---

diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 16f23c3a0c35..8c7664328a49 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 4dcf84715c43..fb70abd17aff 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"