diff options
| author | Martin Panter <vadmium> | 2015-08-31 03:26:46 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-08-31 03:26:46 (GMT) |
| commit | 81174d749af8a3da5cbdce2db511f4d71f2fa5ab (patch) | |
| tree | a817c21fea9607335144d694d8604a58f9e9600f /Doc | |
| parent | 902adbb3935cffcb080bcee4648b583828e657c0 (diff) | |
| parent | e721b7cb8b879a848d47b9716783526c12c341a2 (diff) | |
| download | cpython-81174d749af8a3da5cbdce2db511f4d71f2fa5ab.zip cpython-81174d749af8a3da5cbdce2db511f4d71f2fa5ab.tar.gz cpython-81174d749af8a3da5cbdce2db511f4d71f2fa5ab.tar.bz2 | |
Issue #24952: Merge 3.5 into 3.6
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/_thread.rst | 3 | ||||
| -rw-r--r-- | Doc/library/threading.rst | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst index a787e2f..7122861 100644 --- a/Doc/library/_thread.rst +++ b/Doc/library/_thread.rst @@ -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 diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 5269994..c56d707 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -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 |