Merged revisions 72295 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r72295 | antoine.pitrou | 2009-05-04 23:17:17 +0200 (lun., 04 mai 2009) | 3 lines
Issue #5692: In :class:`zipfile.Zipfile`, fix wrong path calculation when extracting a file to the root directory.
........
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index a54a354..dab595b 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -959,7 +959,9 @@
"""
# build the destination pathname, replacing
# forward slashes to platform specific separators.
- if targetpath[-1:] in (os.path.sep, os.path.altsep):
+ # Strip trailing path separator, unless it represents the root.
+ if (targetpath[-1:] in (os.path.sep, os.path.altsep)
+ and len(os.path.splitdrive(targetpath)[1]) > 1):
targetpath = targetpath[:-1]
# don't include leading "/" from file name if present
diff --git a/Misc/NEWS b/Misc/NEWS
index 378ed32..a92164b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -112,6 +112,9 @@
Library
-------
+- Issue #5692: In :class:`zipfile.Zipfile`, fix wrong path calculation when
+ extracting a file to the root directory.
+
- Issue #5913: os.listdir() should fail for empty path on windows.
- Issue #5084: unpickling now interns the attribute names of pickled objects,