From: Georg Brandl <georg@python.org>
Date: Tue, 25 Mar 2014 08:34:30 +0000 (+0100)
Subject: Closes #18456: Doc fix: PyDict_Update only works with dict-like objects, not key... 
X-Git-Tag: v2.7.7rc1~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fbd2db50054a85ec0594dd4f4e78443a18e759e0;p=python

Closes #18456: Doc fix: PyDict_Update only works with dict-like objects, not key-value sequences. Patch by priyapappachan.
---

diff --git a/Doc/c-api/dict.rst b/Doc/c-api/dict.rst
index 3e967bdccf..3006b6cff9 100644
--- a/Doc/c-api/dict.rst
+++ b/Doc/c-api/dict.rst
@@ -210,8 +210,11 @@ Dictionary Objects
 
 .. c:function:: int PyDict_Update(PyObject *a, PyObject *b)
 
-   This is the same as ``PyDict_Merge(a, b, 1)`` in C, or ``a.update(b)`` in
-   Python.  Return ``0`` on success or ``-1`` if an exception was raised.
+   This is the same as ``PyDict_Merge(a, b, 1)`` in C, and is similar to
+   ``a.update(b)`` in Python except that :c:func:`PyDict_Update` doesn't fall
+   back to the iterating over a sequence of key value pairs if the second
+   argument has no "keys" attribute.  Return ``0`` on success or ``-1`` if an
+   exception was raised.
 
    .. versionadded:: 2.2