changeset:   97558:606082fa2804
branch:      3.5
parent:      97554:b5434aff4e84
parent:      97557:328383905eaf
user:        Martin Panter <vadmium>
date:        Mon Aug 31 03:25:34 2015 +0000
files:       Doc/library/threading.rst Misc/ACKS Misc/NEWS
description:
Issue #24952: Merge 3.4 into 3.5


diff -r b5434aff4e84 -r 606082fa2804 Doc/library/_thread.rst
--- a/Doc/library/_thread.rst	Sun Aug 30 14:42:49 2015 -0700
+++ b/Doc/library/_thread.rst	Mon Aug 31 03:25:34 2015 +0000
@@ -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 -r b5434aff4e84 -r 606082fa2804 Doc/library/threading.rst
--- a/Doc/library/threading.rst	Sun Aug 30 14:42:49 2015 -0700
+++ b/Doc/library/threading.rst	Mon Aug 31 03:25:34 2015 +0000
@@ -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 -r b5434aff4e84 -r 606082fa2804 Misc/ACKS
--- a/Misc/ACKS	Sun Aug 30 14:42:49 2015 -0700
+++ b/Misc/ACKS	Mon Aug 31 03:25:34 2015 +0000
@@ -914,6 +914,7 @@
 Simon Mathieu
 Laura Matson
 Graham Matthews
+mattip
 Martin Matusiak
 Dieter Maurer
 Daniel May
diff -r b5434aff4e84 -r 606082fa2804 Misc/NEWS
--- a/Misc/NEWS	Sun Aug 30 14:42:49 2015 -0700
+++ b/Misc/NEWS	Mon Aug 31 03:25:34 2015 +0000
@@ -41,6 +41,9 @@
 Documentation
 -------------
 
+- Issue #24952: Clarify the default size argument of stack_size() in
+  the "threading" and "_thread" modules. Patch from Mattip.
+
 - Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
   Patch from Zbigniew Jędrzejewski-Szmek.