From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Sat, 8 Sep 2012 17:49:18 +0000 (+0300)
Subject: #15865: merge with 3.2.
X-Git-Tag: v3.3.1rc1~818^2^2~126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b61611309d1a0e08b63f66f0bf0dbd8ced4bdb1;p=python

#15865: merge with 3.2.
---

8b61611309d1a0e08b63f66f0bf0dbd8ced4bdb1
diff --cc Doc/library/threading.rst
index 275a578a77,43087ef153..7ab739b507
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@@ -255,8 -255,7 +255,8 @@@ daemonic, and cannot be :meth:`~Thread.
  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={})
++.. class:: Thread(group=None, target=None, name=None, args=(), kwargs={}, *, \
++                  daemon=None)
  
     This constructor should always be called with keyword arguments.  Arguments
     are:
@@@ -275,12 -274,6 +275,10 @@@
     *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.
 +
     If the subclass overrides the constructor, it must make sure to invoke the
     base class constructor (``Thread.__init__()``) before doing anything else to
     the thread.