summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2011-03-15 19:23:30 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2011-03-15 19:23:30 (GMT)
commitec43833cc7d6d3a41de7ccfb11b69f5738ec7db5 (patch)
tree02849b7191156803287ed8bb15883d41cc43acb7 /Doc
parentab1dfd68e1dd1e5251c6dfa9bc45b10f45ce39a6 (diff)
parent9bb9877d8079ccfc4f5b5448ba111392140112e4 (diff)
downloadcpython-ec43833cc7d6d3a41de7ccfb11b69f5738ec7db5.zip
cpython-ec43833cc7d6d3a41de7ccfb11b69f5738ec7db5.tar.gz
cpython-ec43833cc7d6d3a41de7ccfb11b69f5738ec7db5.tar.bz2
Merge doc update
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/init.rst5
-rw-r--r--Doc/whatsnew/3.2.rst4
2 files changed, 7 insertions, 2 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 2641c8b..623bd7c 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -537,10 +537,11 @@ code, or when embedding the Python interpreter:
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.
+ .. versionchanged:: 3.2
+ This function cannot be called before :c:func:`Py_Initialize()` anymore.
+
.. index:: module: _thread
.. note::
diff --git a/Doc/whatsnew/3.2.rst b/Doc/whatsnew/3.2.rst
index 1baa9e1..256b343 100644
--- a/Doc/whatsnew/3.2.rst
+++ b/Doc/whatsnew/3.2.rst
@@ -2698,3 +2698,7 @@ require changes to your code:
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.
+