summaryrefslogtreecommitdiffstats
path: root/Doc/library/zipfile.rst
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-03-13 03:41:14 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-03-13 03:41:14 (GMT)
commit38dae173d11c0f87cec46d137df9180e1f43d01c (patch)
tree9d3c25a1506df0a2271fe97dbb6227a2f53d6dfe /Doc/library/zipfile.rst
parent09bb904fda1df8556b3925a960cd9e9311dca5cc (diff)
parentf0f14f72bb8aba4955749c7993f72083c2680fbe (diff)
downloadcpython-38dae173d11c0f87cec46d137df9180e1f43d01c.zip
cpython-38dae173d11c0f87cec46d137df9180e1f43d01c.tar.gz
cpython-38dae173d11c0f87cec46d137df9180e1f43d01c.tar.bz2
merge 3.4
Diffstat (limited to 'Doc/library/zipfile.rst')
-rw-r--r--Doc/library/zipfile.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index faef6af..ef9a2ea 100644
--- 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: