summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-09-26 20:54:24 +0300
committerSerhiy Storchaka <storchaka@gmail.com>2016-09-26 20:54:24 +0300
commit4e3aab7c7358fb04e2bc7b79836989c4ce8a9f56 (patch)
treec5dfdf40ed0d0267739a3d3b4711a6a9a1d07723
parent5a274465a1e34f0321dabb949821c40002176276 (diff)
parent4781b59185220b6db3081257a21ba904efcce012 (diff)
downloadcpython-git-4e3aab7c7358fb04e2bc7b79836989c4ce8a9f56.tar.gz
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.rst13
-rw-r--r--Include/abstract.h14
2 files changed, 13 insertions, 14 deletions
diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst
index fe601b605b..a71e942837 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 3e8ca1f48e..44107a8a81 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.
*/