[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

Tue Mar 25 09:35:15 CET 2014

http://hg.python.org/cpython/rev/9f7345e23b32
changeset: 89961:9f7345e23b32
parent: 89959:b1e3035216f8
parent: 89960:8e1637e3a099
user: Georg Brandl <georg at python.org>
date: Tue Mar 25 09:34:55 2014 +0100
summary:
 merge with 3.4
files:
 Doc/c-api/dict.rst | 7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Doc/c-api/dict.rst b/Doc/c-api/dict.rst
--- a/Doc/c-api/dict.rst
+++ b/Doc/c-api/dict.rst
@@ -201,8 +201,11 @@
 
 .. 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)
-- 
Repository URL: http://hg.python.org/cpython
