From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Mon, 5 Apr 2010 07:58:21 +0000 (+0000)
Subject: Merged revisions 79615 via svnmerge from
X-Git-Tag: v3.1.3rc1~981
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6bccd298456f3aea7d764d6d01b0d4d2334ee5b8;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 79615 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r79615 | georg.brandl | 2010-04-02 23:12:42 +0300 (Fri, 02 Apr 2010) | 1 line

  #8288: fix next -> __next__.
........
---

diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 7e9f4d841b1a..f4148530d853 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -161,7 +161,7 @@ ZipFile Objects
 
       The file-like object is read-only and provides the following methods:
       :meth:`read`, :meth:`readline`, :meth:`readlines`, :meth:`__iter__`,
-      :meth:`next`.
+      :meth:`__next__`.
 
    .. note::