diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-10-06 01:20:51 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-10-06 01:20:51 (GMT) |
| commit | 1fe8ada4e560816e972d275bb2bef225abe1aa1d (patch) | |
| tree | 977da6c0ef1dd47dca21fc50c6b54cd6cc16e2f2 /Doc/c-api | |
| parent | 3cb9379881a91f81416b770795b0fc81c6de6bf9 (diff) | |
| parent | 1c262a6c7583d8e8cc278e6119dedf43e41c77be (diff) | |
| download | cpython-1fe8ada4e560816e972d275bb2bef225abe1aa1d.zip cpython-1fe8ada4e560816e972d275bb2bef225abe1aa1d.tar.gz cpython-1fe8ada4e560816e972d275bb2bef225abe1aa1d.tar.bz2 | |
merge 3.4 (#18494)
Diffstat (limited to 'Doc/c-api')
| -rw-r--r-- | 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 index 3e7c3b6..7c2f6d5 100644 --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -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. |