From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 24 May 2009 19:30:52 +0000 (+0000)
Subject: Issue #6050: Don't fail extracting a directory from a zipfile if
X-Git-Tag: v2.7a1~1109
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b09c42ffec7b56b7f94c11d160ca083944c9cf8;p=thirdparty%2FPython%2Fcpython.git

Issue #6050: Don't fail extracting a directory from a zipfile if
the directory already exists.
---

diff --git a/Lib/test/test_zipfile.py b/Lib/test/test_zipfile.py
index fcb55d1523a8..cb8ba10d0fa6 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -1023,6 +1023,11 @@ class TestWithDirectory(unittest.TestCase):
         self.assertTrue(os.path.isdir(os.path.join(TESTFN2, "a", "b")))
         self.assertTrue(os.path.exists(os.path.join(TESTFN2, "a", "b", "c")))
 
+    def test_bug_6050(self):
+        # Extraction should succeed if directories already exist
+        os.mkdir(os.path.join(TESTFN2, "a"))
+        self.testExtractDir()
+
     def testStoreDir(self):
         os.mkdir(os.path.join(TESTFN2, "x"))
         zipf = zipfile.ZipFile(TESTFN, "w")
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index e3d40b4a3a6f..68885f9e0b8e 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -971,7 +971,8 @@ class ZipFile:
             os.makedirs(upperdirs)
 
         if member.filename[-1] == '/':
-            os.mkdir(targetpath)
+            if not os.path.isdir(targetpath):
+                os.mkdir(targetpath)
             return targetpath
 
         source = self.open(member, pwd=pwd)
diff --git a/Misc/NEWS b/Misc/NEWS
index a21651b161d8..c2f2121fa94d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -302,6 +302,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6050: Don't fail extracting a directory from a zipfile if
+  the directory already exists.
+
 - Issue #5311: bdist_msi can now build packages that do not depend on a
   specific Python version.