summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-06-03 00:42:48 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-06-03 00:42:48 (GMT)
commita4b538df75dac470442c8bd8b2854d462bd75cc4 (patch)
treec32f0a282312e9f253f3f6763eb6ffeda542f363
parent9ce635f7bde6a0e61737af87a3546de6fe55880a (diff)
downloadcpython-a4b538df75dac470442c8bd8b2854d462bd75cc4.zip
cpython-a4b538df75dac470442c8bd8b2854d462bd75cc4.tar.gz
cpython-a4b538df75dac470442c8bd8b2854d462bd75cc4.tar.bz2
Issue 21533: Dicts take iterables, not iterators. Patch by Wolfgang Maier.
-rw-r--r--Doc/library/stdtypes.rst4
-rw-r--r--Misc/ACKS1
2 files changed, 3 insertions, 2 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index 9e236a5..f229967 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1989,8 +1989,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
diff --git a/Misc/ACKS b/Misc/ACKS
index 9ae3341..afe212c 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -819,6 +819,7 @@ Tim MacKenzie
Nick Maclaren
Don MacMillen
Tomasz Maćkowiak
+Wolfgang Maier
Steve Majewski
Marek Majkowski
Grzegorz Makarewicz