From: Berker Peksag Date: Mon, 2 Jan 2017 03:14:12 +0000 (+0300) Subject: Issue #29013: Merge from 3.5 X-Git-Tag: v3.6.1rc1~224 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5430293fdf286b33f2370d15705ee4339c81e82c;p=thirdparty%2FPython%2Fcpython.git Issue #29013: Merge from 3.5 --- 5430293fdf286b33f2370d15705ee4339c81e82c diff --cc Doc/library/zipfile.rst index 905648914b37,d144ae36f1e7..5eb6f1033806 --- a/Doc/library/zipfile.rst +++ b/Doc/library/zipfile.rst @@@ -147,12 -147,12 +147,12 @@@ ZipFile Object *compression* is the ZIP compression method to use when writing the archive, and should be :const:`ZIP_STORED`, :const:`ZIP_DEFLATED`, :const:`ZIP_BZIP2` or :const:`ZIP_LZMA`; unrecognized - values will cause :exc:`RuntimeError` to be raised. If :const:`ZIP_DEFLATED`, + values will cause :exc:`NotImplementedError` to be raised. If :const:`ZIP_DEFLATED`, :const:`ZIP_BZIP2` or :const:`ZIP_LZMA` is specified but the corresponding module (:mod:`zlib`, :mod:`bz2` or :mod:`lzma`) is not available, :exc:`RuntimeError` - is also raised. The default is :const:`ZIP_STORED`. If *allowZip64* is + is raised. The default is :const:`ZIP_STORED`. If *allowZip64* is ``True`` (the default) zipfile will create ZIP files that use the ZIP64 - extensions when the zipfile is larger than 2 GiB. If it is false :mod:`zipfile` + extensions when the zipfile is larger than 4 GiB. If it is false :mod:`zipfile` will raise an exception when the ZIP file would require ZIP64 extensions. If the file is created with mode ``'w'``, ``'x'`` or ``'a'`` and then