summaryrefslogtreecommitdiff
path: root/Lib/threading.py
diff options
context:
space:
mode:
authorDong-hee Na <donghee.na92@gmail.com>2019-01-18 18:50:47 +0900
committerVictor Stinner <vstinner@redhat.com>2019-01-18 10:50:47 +0100
commit36d9e9a4d5238d5a2f09679b6c51be66fbfc12c4 (patch)
tree55178a48f7127d4df48e9721c26aaa5600e11e0d /Lib/threading.py
parenta902239f22c322d8988c514dd1c724aade3e4ef3 (diff)
downloadcpython-git-36d9e9a4d5238d5a2f09679b6c51be66fbfc12c4.tar.gz
bpo-35283: Update the docstring of threading.Thread.join method (GH-11596)
Diffstat (limited to 'Lib/threading.py')
-rw-r--r--Lib/threading.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index 7bc8a8573c..000981f6d9 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -1007,7 +1007,7 @@ class Thread:
When the timeout argument is present and not None, it should be a
floating point number specifying a timeout for the operation in seconds
(or fractions thereof). As join() always returns None, you must call
- isAlive() after join() to decide whether a timeout happened -- if the
+ is_alive() after join() to decide whether a timeout happened -- if the
thread is still alive, the join() call timed out.
When the timeout argument is not present or None, the operation will