]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #28960: Drop comma attached to dash in Thread.join() description
authorMartin Panter <vadmium+py@gmail.com>
Sat, 24 Dec 2016 07:28:26 +0000 (07:28 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Sat, 24 Dec 2016 07:28:26 +0000 (07:28 +0000)
Doc/library/threading.rst

index cddbd52a3aff6039d76080f97f403c952dd29412..2792dfdce04c6c035f4a87e0f2283c73ade4e1cb 100644 (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
       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.
 
       When the *timeout* argument is present and not ``None``, it should be a