[Python-checkins] cpython (merge 3.4 -> default): Closes #23730: merge with 3.4

[zach.ware]

https://hg.python.org/cpython/rev/d958c74ddb0c
changeset:   95618:d958c74ddb0c
parent:      95615:24f2c0279120
parent:      95617:7ac1c2307a70
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Apr 13 16:44:05 2015 -0500
summary:
  Closes #23730: merge with 3.4

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


diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -255,6 +255,8 @@
    to extract to.  *member* can be a filename or a :class:`ZipInfo` object.
    *pwd* is the password used for encrypted files.
 
+   Returns the normalized path created (a directory or new file).
+
    .. note::
 
       If a member filename is an absolute path, a drive/UNC sharepoint and

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