[Python-checkins] cpython (merge 3.5 -> default): Issue #24952: Merge 3.5 into 3.6

Mon Aug 31 05:43:50 CEST 2015

https://hg.python.org/cpython/rev/501c9ab07996
changeset: 97559:501c9ab07996
parent: 97555:6463279d1358
parent: 97558:606082fa2804
user: Martin Panter <vadmium>
date: Mon Aug 31 03:26:46 2015 +0000
summary:
 Issue #24952: Merge 3.5 into 3.6
files:
 Doc/library/_thread.rst | 3 ++-
 Doc/library/threading.rst | 3 ++-
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst
--- a/Doc/library/_thread.rst
+++ b/Doc/library/_thread.rst
@@ -93,7 +93,8 @@
 Return the thread stack size used when creating new threads. The optional
 *size* argument specifies the stack size to be used for subsequently created
 threads, and must be 0 (use platform or configured default) or a positive
- integer value of at least 32,768 (32 KiB). If changing the thread stack size is
+ integer value of at least 32,768 (32 KiB). If *size* is not specified,
+ 0 is used. If changing the thread stack size is
 unsupported, a :exc:`RuntimeError` is raised. If the specified stack size is
 invalid, a :exc:`ValueError` is raised and the stack size is unmodified. 32 KiB
 is currently the minimum supported stack size value to guarantee sufficient
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -89,7 +89,8 @@
 Return the thread stack size used when creating new threads. The optional
 *size* argument specifies the stack size to be used for subsequently created
 threads, and must be 0 (use platform or configured default) or a positive
- integer value of at least 32,768 (32 KiB). If changing the thread stack size is
+ integer value of at least 32,768 (32 KiB). If *size* is not specified,
+ 0 is used. If changing the thread stack size is
 unsupported, a :exc:`RuntimeError` is raised. If the specified stack size is
 invalid, a :exc:`ValueError` is raised and the stack size is unmodified. 32 KiB
 is currently the minimum supported stack size value to guarantee sufficient
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -914,6 +914,7 @@
 Simon Mathieu
 Laura Matson
 Graham Matthews
+mattip
 Martin Matusiak
 Dieter Maurer
 Daniel May
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -64,6 +64,9 @@
 Documentation
 -------------
 
+- Issue #24952: Clarify the default size argument of stack_size() in
+ the "threading" and "_thread" modules. Patch from Mattip.
+
 Tests
 -----
 
-- 
Repository URL: https://hg.python.org/cpython
