[Python-checkins] r81469 - in python/branches/release26-maint: Objects/enumobject.c

[georg.brandl]

Author: georg.brandl
Date: Sat May 22 13:44:30 2010
New Revision: 81469

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Objects/enumobject.c

Modified: python/branches/release26-maint/Objects/enumobject.c
==============================================================================
--- python/branches/release26-maint/Objects/enumobject.c	(original)
+++ python/branches/release26-maint/Objects/enumobject.c	Sat May 22 13:44:30 2010
@@ -159,12 +159,13 @@
 }
 
 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)