summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
commitf10644983e88c73437703a863151593cc37a657f (patch)
treeb3cf3ffcc4d27cf9f81c90efbedbc10a856db857 /Doc/c-api
parent318909b297241f9c46f25815e12d05136da57fa9 (diff)
parente130a52d8a60229f53c8bc2ea7a1f51ee592bbd7 (diff)
downloadcpython-f10644983e88c73437703a863151593cc37a657f.zip
cpython-f10644983e88c73437703a863151593cc37a657f.tar.gz
cpython-f10644983e88c73437703a863151593cc37a657f.tar.bz2
Merge with 3.2.
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/exceptions.rst2
-rw-r--r--Doc/c-api/method.rst4
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 2fd5145..c7252ed 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -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.
diff --git a/Doc/c-api/method.rst b/Doc/c-api/method.rst
index 27f9576..acc81e4 100644
--- a/Doc/c-api/method.rst
+++ b/Doc/c-api/method.rst
@@ -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*.