mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-30 04:15:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Manually merge r84187

Browse source
This commit is contained in:
Éric Araujo 2010-08-18 22:42:07 +00:00
parent a9d7c7772f
commit 790c9af79e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/library/stdtypes.rst
View file

@ -1960,8 +1960,8 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
.. method:: update([other]) .. method:: update([other])
Update the dictionary with the key/value pairs from *other*, overwriting Update the dictionary with the key/value pairs from *other*, overwriting
existing keys. Return ``None``. existing keys. Return ``None``.
:meth:`update` accepts either another dictionary object or an iterable of :meth:`update` accepts either another dictionary object or an iterable of
key/value pairs (as a tuple or other iterable of length two). If keyword key/value pairs (as a tuple or other iterable of length two). If keyword