Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-10-19 11:06:26 +03:00
commit f10644983e
41 changed files with 48 additions and 48 deletions

View file

@ -525,7 +525,7 @@ recursion depth automatically).
Marks a point where a recursive C-level call is about to be performed.
If :const:`USE_STACKCHECK` is defined, this function checks if the the OS
If :const:`USE_STACKCHECK` is defined, this function checks if the OS
stack overflowed using :c:func:`PyOS_CheckStack`. In this is the case, it
sets a :exc:`MemoryError` and returns a nonzero value.