From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 24 May 2009 19:42:14 +0000 (+0000)
Subject: Merged revisions 72893 via svnmerge from
X-Git-Tag: v2.6.3rc1~248
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7e46f8152b50f76114b324171d69f88512e98cb;p=python

Merged revisions 72893 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72893 | martin.v.loewis | 2009-05-24 21:30:52 +0200 (So, 24 Mai 2009) | 3 lines

  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 21fc703d4e..1fed79acae 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -994,6 +994,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 aa88563e5f..a50a458336 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -959,7 +959,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 6264e58fa3..1c03d701df 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -50,6 +50,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #6050: Don't fail extracting a directory from a zipfile if
+  the directory already exists.
+
 - Issue #1309352: fcntl now converts its third arguments to a C `long` rather
   than an int, which makes some operations possible under 64-bit Linux (e.g.
   DN_MULTISHOT with F_NOTIFY).