Commit 25f1d97a authored by Serhiy Storchaka's avatar Serhiy Storchaka

Issues #25909, #28211: Restored correct documentation of PyMapping_Items,

PyMapping_Keys and PyMapping_Values.  Based on patch by Xiang Zhang.
parent 9ec0aa13
...@@ -50,21 +50,20 @@ Mapping Protocol ...@@ -50,21 +50,20 @@ Mapping Protocol
.. c:function:: PyObject* PyMapping_Keys(PyObject *o) .. c:function:: PyObject* PyMapping_Keys(PyObject *o)
On success, return a list, a tuple or a dictionary view in case of a dict, On success, return a list or tuple of the keys in object *o*. On failure,
of the keys in object *o*. On failure, return *NULL*. return *NULL*.
.. c:function:: PyObject* PyMapping_Values(PyObject *o) .. c:function:: PyObject* PyMapping_Values(PyObject *o)
On success, return a list, a tuple or a dictionary view in case of a dict, of On success, return a list or tuple of the values in object *o*. On failure,
the values in object *o*. On failure, return *NULL*. return *NULL*.
.. c:function:: PyObject* PyMapping_Items(PyObject *o) .. c:function:: PyObject* PyMapping_Items(PyObject *o)
On success, return a list, a tuple or a dictionary view in case of a dict, of On success, return a list or tuple of the items in object *o*, where each item
the items in object *o*, where each item is a tuple containing a key-value is a tuple containing a key-value pair. On failure, return *NULL*.
pair. On failure, return *NULL*.
.. c:function:: PyObject* PyMapping_GetItemString(PyObject *o, const char *key) .. c:function:: PyObject* PyMapping_GetItemString(PyObject *o, const char *key)
......
...@@ -1216,23 +1216,23 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ ...@@ -1216,23 +1216,23 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o); PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o);
/* /*
On success, return a list, a tuple or a dictionary view in case of a dict, On success, return a list or tuple of the keys in object o.
of the keys in object o. On failure, return NULL. On failure, return NULL.
*/ */
PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o); PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o);
/* /*
On success, return a list, a tuple or a dictionary view in case of a dict, On success, return a list or tuple of the values in object o.
of the values in object o. On failure, return NULL. On failure, return NULL.
*/ */
PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o); PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o);
/* /*
On success, return a list, a tuple or a dictionary view in case of a dict, On success, return a list or tuple of the items in object o,
of the items in object o, where each item is a tuple containing a key-value where each item is a tuple containing a key-value pair.
pair. On failure, return NULL. On failure, return NULL.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment