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: v3.4.1rc1~186
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c669c1154d505a055f14b919f48e8fa1e1ab7cf;p=thirdparty%2FPython%2Fcpython.git

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 5a9dca284500..aeff640564b0 100644
--- a/Doc/c-api/dict.rst
+++ b/Doc/c-api/dict.rst
@@ -201,8 +201,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.
 
 
 .. c:function:: int PyDict_MergeFromSeq2(PyObject *a, PyObject *seq2, int override)