diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-05-24 19:42:14 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-05-24 19:42:14 (GMT) |
| commit | e7e46f8152b50f76114b324171d69f88512e98cb (patch) | |
| tree | 4a66115e8b421548954f3e37cd02c956200330cf /Lib/zipfile.py | |
| parent | 6c3064beed67b4cd5dc23264ed9520eaeec4cb6d (diff) | |
| download | cpython-e7e46f8152b50f76114b324171d69f88512e98cb.zip cpython-e7e46f8152b50f76114b324171d69f88512e98cb.tar.gz cpython-e7e46f8152b50f76114b324171d69f88512e98cb.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/zipfile.py')
| -rw-r--r-- | Lib/zipfile.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py index aa88563..a50a458 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) |