traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.4 (#18494)

This commit is contained in:
Benjamin Peterson 2014-10-05 21:20:51 -04:00
parent 3cb9379881 1c262a6c75
commit 1fe8ada4e5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/c-api/object.rst
View File

@ -101,7 +101,7 @@ Object Protocol
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 @@ Object Protocol
.. 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.