Issue #24952: Merge 3.4 into 3.5

This commit is contained in:
Martin Panter 2015-08-31 03:25:34 +00:00
commit e721b7cb8b
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 Return the thread stack size used when creating new threads. The optional
*size* argument specifies the stack size to be used for subsequently created *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 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 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 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 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 Return the thread stack size used when creating new threads. The optional
*size* argument specifies the stack size to be used for subsequently created *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 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 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 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 is currently the minimum supported stack size value to guarantee sufficient

View file

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

View file

@ -41,6 +41,9 @@ Library
Documentation 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. - Issue #23725: Overhaul tempfile docs. Note deprecated status of mktemp.
Patch from Zbigniew Jędrzejewski-Szmek. Patch from Zbigniew Jędrzejewski-Szmek.