[Python-checkins] cpython (3.2): Issue 11889: Clarify docs for enumerate.

Sat Jun 25 15:01:21 CEST 2011

http://hg.python.org/cpython/rev/d0df12b32522
changeset: 70969:d0df12b32522
branch: 3.2
parent: 70966:c5fca67a7e8c
user: Raymond Hettinger <python at rcn.com>
date: Sat Jun 25 15:00:14 2011 +0200
summary:
 Issue 11889: Clarify docs for enumerate.
files:
 Doc/library/functions.rst | 13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -331,14 +331,13 @@
 :term:`iterator`, or some other object which supports iteration. The
 :meth:`__next__` method of the iterator returned by :func:`enumerate` returns a
 tuple containing a count (from *start* which defaults to 0) and the
- corresponding value obtained from iterating over *iterable*.
+ values obtained from iterating over *iterable*.
 
- >>> for i, season in enumerate('Spring Summer Fall Winter'.split(), start=1):
- print(i, season)
- 1 Spring
- 2 Summer
- 3 Fall
- 4 Winter
+ >>> seasons = ['Spring', 'Summer', 'Fall', 'Winter']
+ >>> list(enumerate(seasons))
+ [(0, 'Spring'), (1, 'Summer'), (2, 'Fall'), (3, 'Winter')]
+ >>> list(enumerate(seasons, start=1))
+ [(1, 'Spring'), (2, 'Summer'), (3, 'Fall'), (4, 'Winter')]
 
 Equivalent to::
 
-- 
Repository URL: http://hg.python.org/cpython
