mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 72893 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Martin v. Löwis 2009-05-24 19:47:22 +00:00
parent 403117aa60
commit 70ccd167de
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/zipfile.py
View file

@ -978,7 +978,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)