summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-03-13 22:28:28 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-03-13 22:28:28 (GMT)
commit9bd3bbcfe8f41509a0d60691000bd21e5338378f (patch)
treec1c71c3295f2f687755f1092fcc7666e27ba87c8
parent34db4698958c64436de3a16fd5abf7224557492f (diff)
downloadcpython-9bd3bbcfe8f41509a0d60691000bd21e5338378f.zip
cpython-9bd3bbcfe8f41509a0d60691000bd21e5338378f.tar.gz
cpython-9bd3bbcfe8f41509a0d60691000bd21e5338378f.tar.bz2
Issue #11329: PyEval_InitThreads() cannot be called before Py_Initialize() anymore
-rw-r--r--Doc/ACKS.txt1
-rw-r--r--Doc/c-api/init.rst6
2 files changed, 3 insertions, 4 deletions
diff --git a/Doc/ACKS.txt b/Doc/ACKS.txt
index c51d211..7f67d36 100644
--- a/Doc/ACKS.txt
+++ b/Doc/ACKS.txt
@@ -120,6 +120,7 @@ docs@python.org), and we'll be glad to correct the problem.
* Robert Lehmann
* Marc-André Lemburg
* Ross Light
+ * Gediminas Liktaras
* Ulf A. Lindgren
* Everett Lipman
* Mirko Liss
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index da55ab0..2641c8b 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -29,8 +29,7 @@ Initializing and finalizing the interpreter
Initialize the Python interpreter. In an application embedding Python, this
should be called before using any other Python/C API functions; with the
- exception of :c:func:`Py_SetProgramName`, :c:func:`Py_SetPath`,
- and :c:func:`PyEval_InitThreads`. This initializes
+ exception of :c:func:`Py_SetProgramName` and :c:func:`Py_SetPath`. This initializes
the table of loaded modules (``sys.modules``), and creates the fundamental
modules :mod:`builtins`, :mod:`__main__` and :mod:`sys`. It also initializes
the module search path (``sys.path``). It does not set ``sys.argv``; use
@@ -540,8 +539,7 @@ code, or when embedding the Python interpreter:
.. index:: single: Py_Initialize()
- This is a no-op when called for a second time. It is safe to call this function
- before calling :c:func:`Py_Initialize`.
+ This is a no-op when called for a second time.
.. index:: module: _thread