merge 3.4

This commit is contained in:
Benjamin Peterson 2015-03-12 22:41:14 -05:00
commit 38dae173d1

View file

@ -210,7 +210,7 @@ ZipFile Objects
password used for encrypted files. Calling :meth:`.open` on a closed password used for encrypted files. Calling :meth:`.open` on a closed
ZipFile will raise a :exc:`RuntimeError`. 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:: :keyword:`with` statement::
with ZipFile('spam.zip') as myzip: with ZipFile('spam.zip') as myzip: