Issue #24952: Merge 3.5 into 3.6

This commit is contained in:
Martin Panter 2015-08-31 03:26:46 +00:00
commit 81174d749a
4 changed files with 8 additions and 2 deletions

View File

@ -93,7 +93,8 @@ It defines the following constants and functions:
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

View File

@ -89,7 +89,8 @@ This module defines the following functions:
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

View File

@ -914,6 +914,7 @@ Nick Mathewson
Simon Mathieu
Laura Matson
Graham Matthews
mattip
Martin Matusiak
Dieter Maurer
Daniel May

View File

@ -64,6 +64,9 @@ Library
Documentation
-------------
- Issue #24952: Clarify the default size argument of stack_size() in
the "threading" and "_thread" modules. Patch from Mattip.
Tests
-----