Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #28960: Merge Thread.join() doc from 3.6

This commit is contained in:
Martin Panter 2016-12-24 07:45:17 +00:00
parent 1dd81012e9 3a72ee5b5a
commit 2d88b3b20b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/threading.rst
View File

@ -256,7 +256,7 @@ since it is impossible to detect the termination of alien threads.
Wait until the thread terminates. This blocks the calling thread until Wait until the thread terminates. This blocks the calling thread until
the thread whose :meth:`~Thread.join` method is called terminates -- either the thread whose :meth:`~Thread.join` method is called terminates -- either
normally or through an unhandled exception --, or until the optional normally or through an unhandled exception -- or until the optional
timeout occurs. timeout occurs.
When the *timeout* argument is present and not ``None``, it should be a When the *timeout* argument is present and not ``None``, it should be a