diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-08 17:49:18 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-08 17:49:18 (GMT) |
commit | 8b61611309d1a0e08b63f66f0bf0dbd8ced4bdb1 (patch) | |
tree | b4f1c0b4d58af37a98d0fa5fd0a2f6073a2a3660 /Doc/library/threading.rst | |
parent | 0fbbce99c39f4219610e4c675be47cbefe6739cb (diff) | |
parent | e927e256378707b8f173b38f0a1bac6d23a56d3a (diff) | |
download | cpython-8b61611309d1a0e08b63f66f0bf0dbd8ced4bdb1.zip cpython-8b61611309d1a0e08b63f66f0bf0dbd8ced4bdb1.tar.gz cpython-8b61611309d1a0e08b63f66f0bf0dbd8ced4bdb1.tar.bz2 |
#15865: merge with 3.2.
Diffstat (limited to 'Doc/library/threading.rst')
-rw-r--r-- | Doc/library/threading.rst | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 275a578..7ab739b 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -255,8 +255,8 @@ daemonic, and cannot be :meth:`~Thread.join`\ ed. They are never deleted, since it is impossible to detect the termination of alien threads. -.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}, - verbose=None, *, daemon=None) +.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}, *, \ + daemon=None) This constructor should always be called with keyword arguments. Arguments are: @@ -275,8 +275,6 @@ since it is impossible to detect the termination of alien threads. *kwargs* is a dictionary of keyword arguments for the target invocation. Defaults to ``{}``. - *verbose* is a flag used for debugging messages. - If not ``None``, *daemon* explicitly sets whether the thread is daemonic. If ``None`` (the default), the daemonic property is inherited from the current thread. |