merge 3.4 (#18494)
This commit is contained in:
commit
1fe8ada4e5
|
@ -101,7 +101,7 @@ Object Protocol
|
||||||
This is the equivalent of the Python statement ``del o.attr_name``.
|
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
|
A generic implementation for the getter of a ``__dict__`` descriptor. It
|
||||||
creates the dictionary if necessary.
|
creates the dictionary if necessary.
|
||||||
|
@ -109,7 +109,7 @@ Object Protocol
|
||||||
.. versionadded:: 3.3
|
.. 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
|
A generic implementation for the setter of a ``__dict__`` descriptor. This
|
||||||
implementation does not allow the dictionary to be deleted.
|
implementation does not allow the dictionary to be deleted.
|
||||||
|
|
Loading…
Reference in New Issue