[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

Wed Feb 26 17:42:59 CET 2014

http://hg.python.org/cpython/rev/aaef9e79c19a
changeset: 89402:aaef9e79c19a
parent: 89400:f686cf9be887
parent: 89401:5c5a89f18ba1
user: Zachary Ware <zachary.ware at gmail.com>
date: Wed Feb 26 10:41:40 2014 -0600
summary:
 Merge with 3.3
files:
 Doc/c-api/exceptions.rst | 8 ++++----
 Doc/c-api/module.rst | 2 +-
 Doc/c-api/typeobj.rst | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -525,11 +525,11 @@
 reference, as accessible from Python through :attr:`__cause__`.
 
 
-.. c:function:: void PyException_SetCause(PyObject *ex, PyObject *ctx)
+.. c:function:: void PyException_SetCause(PyObject *ex, PyObject *cause)
 
- Set the cause associated with the exception to *ctx*. Use *NULL* to clear
- it. There is no type check to make sure that *ctx* is either an exception
- instance or :const:`None`. This steals a reference to *ctx*.
+ Set the cause associated with the exception to *cause*. Use *NULL* to clear
+ it. There is no type check to make sure that *cause* is either an exception
+ instance or :const:`None`. This steals a reference to *cause*.
 
 :attr:`__suppress_context__` is implicitly set to ``True`` by this function.
 
diff --git a/Doc/c-api/module.rst b/Doc/c-api/module.rst
--- a/Doc/c-api/module.rst
+++ b/Doc/c-api/module.rst
@@ -120,7 +120,7 @@
 
 Return a pointer to the :c:type:`PyModuleDef` struct from which the module was
 created, or *NULL* if the module wasn't created with
- :c:func:`PyModule_Create`.i
+ :c:func:`PyModule_Create`.
 
 .. c:function:: PyObject* PyState_FindModule(PyModuleDef *def)
 
diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst
--- a/Doc/c-api/typeobj.rst
+++ b/Doc/c-api/typeobj.rst
@@ -205,9 +205,8 @@
 bit currently defined is :const:`Py_PRINT_RAW`. When the :const:`Py_PRINT_RAW`
 flag bit is set, the instance should be printed the same way as :c:member:`~PyTypeObject.tp_str`
 would format it; when the :const:`Py_PRINT_RAW` flag bit is clear, the instance
- should be printed the same was as :c:member:`~PyTypeObject.tp_repr` would format it. It should
- return ``-1`` and set an exception condition when an error occurred during the
- comparison.
+ should be printed the same way as :c:member:`~PyTypeObject.tp_repr` would format it. It should
+ return ``-1`` and set an exception condition when an error occurs.
 
 It is possible that the :c:member:`~PyTypeObject.tp_print` field will be deprecated. In any case,
 it is recommended not to define :c:member:`~PyTypeObject.tp_print`, but instead to rely on
-- 
Repository URL: http://hg.python.org/cpython
