[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #29013: Merge from 3.5

[berker.peksag]

https://hg.python.org/cpython/rev/7c5075a14459
changeset:   105933:7c5075a14459
branch:      3.6
parent:      105930:019125fb6d66
parent:      105932:4685cd33087b
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Jan 02 06:14:12 2017 +0300
summary:
  Issue #29013: Merge from 3.5

files:
  Doc/library/zipfile.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -152,7 +152,7 @@
    (:mod:`zlib`, :mod:`bz2` or :mod:`lzma`) is not available, :exc:`RuntimeError`
    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

-- 
Repository URL: https://hg.python.org/cpython