[Python-checkins] cpython (3.4): Issue 21533: Dicts take iterables, not iterators. Patch by Wolfgang Maier.

Tue Jun 3 02:43:36 CEST 2014

http://hg.python.org/cpython/rev/28665dc3a696
changeset: 90988:28665dc3a696
branch: 3.4
parent: 90985:c2384ca7fc3b
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Jun 02 20:42:56 2014 -0400
summary:
 Issue 21533: Dicts take iterables, not iterators. Patch by Wolfgang Maier.
files:
 Doc/library/stdtypes.rst | 4 ++--
 Misc/ACKS | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -3031,8 +3031,8 @@
 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -818,6 +818,7 @@
 Nick Maclaren
 Don MacMillen
 Tomasz Maćkowiak
+Wolfgang Maier
 Steve Majewski
 Marek Majkowski
 Grzegorz Makarewicz
-- 
Repository URL: http://hg.python.org/cpython
