[Python-checkins] cpython (merge 3.4 -> default): merge 3.4 (#18494)

[benjamin.peterson]

https://hg.python.org/cpython/rev/ec3077e23b7d
changeset:   92832:ec3077e23b7d
parent:      92830:8da1aa71cd73
parent:      92831:9dbd7d34cbcf
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Oct 05 21:20:51 2014 -0400
summary:
  merge 3.4 (#18494)

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


diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -101,7 +101,7 @@
    This is the equivalent of the Python statement ``del o.attr_name``.
 
 
-.. c:function:: PyObject* PyType_GenericGetDict(PyObject *o, void *context)
+.. c:function:: PyObject* PyObject_GenericGetDict(PyObject *o, void *context)
 
    A generic implementation for the getter of a ``__dict__`` descriptor. It
    creates the dictionary if necessary.
@@ -109,7 +109,7 @@
    .. versionadded:: 3.3
 
 
-.. c:function:: int PyType_GenericSetDict(PyObject *o, void *context)
+.. c:function:: int PyObject_GenericSetDict(PyObject *o, void *context)
 
    A generic implementation for the setter of a ``__dict__`` descriptor. This
    implementation does not allow the dictionary to be deleted.

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