summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-06-03 00:42:56 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-06-03 00:42:56 (GMT)
commitb52f8767679a7586b61ebac731af234758082b81 (patch)
treea07df53c9b221a5df4ec6d1eebf4a22ada443ec1
parent8d21357fb5d15dcebb790a0594de3c7afddd8493 (diff)
downloadcpython-b52f8767679a7586b61ebac731af234758082b81.zip
cpython-b52f8767679a7586b61ebac731af234758082b81.tar.gz
cpython-b52f8767679a7586b61ebac731af234758082b81.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 bb421af..e41fa6e 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -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
diff --git a/Misc/ACKS b/Misc/ACKS
index 97d00ea..9cf4572 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -818,6 +818,7 @@ Tim MacKenzie
Nick Maclaren
Don MacMillen
Tomasz Maćkowiak
+Wolfgang Maier
Steve Majewski
Marek Majkowski
Grzegorz Makarewicz