From: Ezio Melotti Date: Fri, 25 Sep 2009 16:14:31 +0000 (+0000) Subject: Merged revisions 75057 via svnmerge from X-Git-Tag: v3.1.2rc1~490 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3e61a480f13be66756092452b2cc9c284f1322a;p=thirdparty%2FPython%2Fcpython.git Merged revisions 75057 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75057 | ezio.melotti | 2009-09-25 19:12:33 +0300 (Fri, 25 Sep 2009) | 9 lines Merged revisions 75055 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75055 | ezio.melotti | 2009-09-25 19:07:55 +0300 (Fri, 25 Sep 2009) | 1 line #6994: fix typo in enumerate docstring ........ ................ --- diff --git a/Objects/enumobject.c b/Objects/enumobject.c index 62e55bb88a2c..3d9bfada9e62 100644 --- a/Objects/enumobject.c +++ b/Objects/enumobject.c @@ -161,7 +161,7 @@ enum_next(enumobject *en) PyDoc_STRVAR(enum_doc, "enumerate(iterable) -> iterator for index, value of iterable\n" "\n" -"Return an enumerate object. iterable must be an other object that supports\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]), ...");