[Python-checkins] cpython (merge default -> default): merged

Tue Mar 15 20:24:14 CET 2011

http://hg.python.org/cpython/rev/7523fb0410f2
changeset: 68516:7523fb0410f2
parent: 68515:395d4426415b
parent: 68512:41187b44f3db
user: Barry Warsaw <barry at python.org>
date: Tue Mar 15 15:23:56 2011 -0400
summary:
 merged
files:

diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -537,9 +537,10 @@
 operations such as ``PyEval_ReleaseThread(tstate)``. It is not needed before
 calling :c:func:`PyEval_SaveThread` or :c:func:`PyEval_RestoreThread`.
 
- .. index:: single: Py_Initialize()
+ This is a no-op when called for a second time.
 
- This is a no-op when called for a second time.
+ .. versionchanged:: 3.2
+ This function cannot be called before :c:func:`Py_Initialize()` anymore.
 
 .. index:: module: _thread
 
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -2698,3 +2698,7 @@
 a new function, :func:`asyncore.handle_accepted`, was added to replace it.
 
 (Contributed by Giampaolo Rodola in :issue:`6706`.)
+
+* Due to the new :term:`GIL` implementation, :c:func:`PyEval_InitThreads()`
+ cannot be called before :c:func:`Py_Initialize()` anymore.
+
-- 
Repository URL: http://hg.python.org/cpython
