merge 3.4

38dae173 · Benjamin Peterson · 09bb904f · f0f14f72 · 38dae173
Commit 38dae173 authored Mar 12, 2015 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Doc/library/zipfile.rst Doc/library/zipfile.rst +1 -1

No files found.
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -210,7 +210,7 @@ ZipFile Objects
   password used for encrypted files.  Calling  :meth:`.open` on a closed
   ZipFile will raise a  :exc:`RuntimeError`.

-   :func:`~ZipFile.open` is also a context manager and therefore supports the
+   :meth:`~ZipFile.open` is also a context manager and therefore supports the
   :keyword:`with` statement::

      with ZipFile('spam.zip') as myzip: