From e199a494677933cbfce3fa7a3ee4bd2f40113153 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Mon, 4 May 2009 21:24:37 +0000 Subject: [PATCH] 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. ........ --- Lib/zipfile.py | 4 +++- Misc/NEWS | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Lib/zipfile.py b/Lib/zipfile.py index fe012968b37..aa88563e5f1 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -940,7 +940,9 @@ class ZipFile: """ # 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 03d318d9299..62f2948f872 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -36,6 +36,9 @@ Core and Builtins Library ------- +- Issue #5692: In :class:`zipfile.Zipfile`, fix wrong path calculation when + extracting a file to the root directory. + - Issue #2245: aifc now skips chunk types it doesn't recognize, per spec. - Issue #4305: ctypes should now build again on mipsel-linux-gnu