diff options
author | Georg Brandl <georg@python.org> | 2010-05-22 11:44:30 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2010-05-22 11:44:30 (GMT) |
commit | e37049ccd7084646521add48478601d5b425300d (patch) | |
tree | 574b4910bf05e3d1ae9ac01facc5d1f978456282 /Objects | |
parent | f9f33aa38d8f4cca28f32a522f28f4066de6d092 (diff) | |
download | cpython-e37049ccd7084646521add48478601d5b425300d.zip cpython-e37049ccd7084646521add48478601d5b425300d.tar.gz cpython-e37049ccd7084646521add48478601d5b425300d.tar.bz2 |
Merged revisions 81468 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81468 | georg.brandl | 2010-05-22 13:43:25 +0200 (Sa, 22 Mai 2010) | 1 line
#8635: document enumerate() start parameter in docstring.
........
Diffstat (limited to 'Objects')
-rw-r--r-- | Objects/enumobject.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Objects/enumobject.c b/Objects/enumobject.c index 6913709..d0c8782 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -159,12 +159,13 @@ enum_next(enumobject *en) } PyDoc_STRVAR(enum_doc, -"enumerate(iterable) -> iterator for index, value of iterable\n" +"enumerate(iterable[, start]) -> iterator for index, value of iterable\n" "\n" "Return an enumerate object. iterable must be another object that supports\n" "iteration. The enumerate object yields pairs containing a count (from\n" -"zero) and a value yielded by the iterable argument. enumerate is useful\n" -"for obtaining an indexed list: (0, seq[0]), (1, seq[1]), (2, seq[2]), ..."); +"start, which defaults to zero) and a value yielded by the iterable argument.\n" +"enumerate is useful for obtaining an indexed list:\n" +" (0, seq[0]), (1, seq[1]), (2, seq[2]), ..."); PyTypeObject PyEnum_Type = { PyVarObject_HEAD_INIT(&PyType_Type, 0) |