[Python-checkins] cpython (merge 3.1 -> 3.2): #11997: merge with 3.1.

ezio.melotti python-checkins at python.org
Thu May 5 13:22:11 CEST 2011


http://hg.python.org/cpython/rev/5a2d42a8c1ab
changeset:   69844:5a2d42a8c1ab
branch:      3.2
parent:      69840:b4b0a1458638
parent:      69843:3aa51217492c
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Thu May 05 14:21:18 2011 +0300
summary:
  #11997: merge with 3.1.

files:
  Doc/c-api/init.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


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
@@ -883,7 +883,7 @@
 modules.
 
 Also note that combining this functionality with :c:func:`PyGILState_\*` APIs
-is delicate, become these APIs assume a bijection between Python thread states
+is delicate, because these APIs assume a bijection between Python thread states
 and OS-level threads, an assumption broken by the presence of sub-interpreters.
 It is highly recommended that you don't switch sub-interpreters between a pair
 of matching :c:func:`PyGILState_Ensure` and :c:func:`PyGILState_Release` calls.

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list