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 3b04ce2..4b6d825 100644
--- a/Lib/test/test_zipfile.py
+++ b/Lib/test/test_zipfile.py
@@ -1012,6 +1012,11 @@
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")