Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-02-27 17:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge with 3.4

Browse source
This commit is contained in:
Terry Jan Reedy 2014-06-02 20:43:13 -04:00
commit 15ec11e4e3
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Doc/library/stdtypes.rst
View file

@ -3031,8 +3031,8 @@ pairs within braces, for example: ``{'jack': 4098, 'sjoerd': 4127}`` or ``{4098:
If no positional argument is given, an empty dictionary is created.
If a positional argument is given and it is a mapping object, a dictionary
is created with the same key-value pairs as the mapping object. Otherwise,
the positional argument must be an :term:`iterator` object. Each item in
the iterable must itself be an iterator with exactly two objects. The
the positional argument must be an :term:`iterable` object. Each item in
the iterable must itself be an iterable with exactly two objects. The
first object of each item becomes a key in the new dictionary, and the
second object the corresponding value. If a key occurs more than once, the
last value for that key becomes the corresponding value in the new

1
Misc/ACKS
View file

@ -824,6 +824,7 @@ Tim MacKenzie
Nick Maclaren
Don MacMillen
Tomasz Maćkowiak
Wolfgang Maier
Steve Majewski
Marek Majkowski
Grzegorz Makarewicz