diff options
author | Serhiy Storchaka <storchaka@gmail.com> | 2016-09-26 17:53:27 (GMT) |
---|---|---|
committer | Serhiy Storchaka <storchaka@gmail.com> | 2016-09-26 17:53:27 (GMT) |
commit | 4781b59185220b6db3081257a21ba904efcce012 (patch) | |
tree | 3432b5be62d310f66cabc21e35cf4a9355f1d3cb | |
parent | 9df89d06a06877ebddffcdece30e1df8b157c637 (diff) | |
parent | 1d480bea9c951af9c317b699c4a420990f401918 (diff) | |
download | cpython-4781b59185220b6db3081257a21ba904efcce012.zip cpython-4781b59185220b6db3081257a21ba904efcce012.tar.gz cpython-4781b59185220b6db3081257a21ba904efcce012.tar.bz2 |
Issues #25909, #28211: Restored correct documentation of PyMapping_Items,
PyMapping_Keys and PyMapping_Values. Based on patch by Xiang Zhang.
-rw-r--r-- | Doc/c-api/mapping.rst | 13 | ||||
-rw-r--r-- | Include/abstract.h | 14 |
2 files changed, 13 insertions, 14 deletions
diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst index fe601b6..a71e942 100644 --- a/Doc/c-api/mapping.rst +++ b/Doc/c-api/mapping.rst @@ -50,21 +50,20 @@ Mapping Protocol .. c:function:: PyObject* PyMapping_Keys(PyObject *o) - On success, return a list, a tuple or a dictionary view in case of a dict, - of the keys in object *o*. On failure, return *NULL*. + On success, return a list or tuple of the keys in object *o*. On failure, + return *NULL*. .. c:function:: PyObject* PyMapping_Values(PyObject *o) - On success, return a list, a tuple or a dictionary view in case of a dict, of - the values in object *o*. On failure, return *NULL*. + On success, return a list or tuple of the values in object *o*. On failure, + return *NULL*. .. c:function:: PyObject* PyMapping_Items(PyObject *o) - On success, return a list, a tuple or a dictionary view in case of a dict, of - the items in object *o*, where each item is a tuple containing a key-value - pair. On failure, return *NULL*. + On success, return a list or tuple of the items in object *o*, where each item + is a tuple containing a key-value pair. On failure, return *NULL*. .. c:function:: PyObject* PyMapping_GetItemString(PyObject *o, const char *key) diff --git a/Include/abstract.h b/Include/abstract.h index 3e8ca1f..44107a8 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -1302,23 +1302,23 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o); /* - On success, return a list, a tuple or a dictionary view in case of a dict, - of the keys in object o. On failure, return NULL. + On success, return a list or tuple of the keys in object o. + On failure, return NULL. */ PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o); /* - On success, return a list, a tuple or a dictionary view in case of a dict, - of the values in object o. On failure, return NULL. + On success, return a list or tuple of the values in object o. + On failure, return NULL. */ PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o); /* - On success, return a list, a tuple or a dictionary view in case of a dict, - of the items in object o, where each item is a tuple containing a key-value - pair. On failure, return NULL. + On success, return a list or tuple of the items in object o, + where each item is a tuple containing a key-value pair. + On failure, return NULL. */ |