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

PyMapping_Keys and PyMapping_Values.  Based on patch by Xiang Zhang.

diff --git a/Doc/c-api/mapping.rst b/Doc/c-api/mapping.rst
index fe601b605b13837f1c38ccb8dae4b19037dc6132..a71e94283776e96b9eaa4f87de1eb020a72aa6d1 100644 (file)
--- 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 438610ba98585a6e6e421b7d0558095fa84a0611..36df5a7ce2a2d30cbb63f071905925d358a52e5c 100644 (file)
--- a/Include/abstract.h
+++ b/Include/abstract.h
@@ -1216,23 +1216,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.
 
        */