mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge with 3.2.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Doc/c-api/exceptions.rst
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.

4
Doc/c-api/method.rst
View file

@ -27,7 +27,7 @@ to bind a :c:data:`PyCFunction` to a class object. It replaces the former call
.. c:function:: PyObject* PyInstanceMethod_New(PyObject *func)
Return a new instance method object, with *func* being any callable object
*func* is is the function that will be called when the instance method is
*func* is the function that will be called when the instance method is
called.
@ -70,7 +70,7 @@ no longer available.
.. c:function:: PyObject* PyMethod_New(PyObject *func, PyObject *self)
Return a new method object, with *func* being any callable object and *self*
the instance the method should be bound. *func* is is the function that will
the instance the method should be bound. *func* is the function that will
be called when the method is called. *self* must not be *NULL*.