changeset:   92131:7b933005c492
branch:      3.4
parent:      92127:a894b629bbea
user:        Serhiy Storchaka <storchaka@gmail.com>
date:        Sun Aug 17 15:14:48 2014 +0300
files:       Lib/zipfile.py Misc/NEWS
description:
Issue #22201: Command-line interface of the zipfile module now correctly
extracts ZIP files with directory entries.  Patch by Ryan Wilson.


diff -r a894b629bbea -r 7b933005c492 Lib/zipfile.py
--- a/Lib/zipfile.py	Sun Aug 17 12:20:02 2014 +0300
+++ b/Lib/zipfile.py	Sun Aug 17 15:14:48 2014 +0300
@@ -1764,18 +1764,7 @@
             sys.exit(1)
 
         with ZipFile(args[1], 'r') as zf:
-            out = args[2]
-            for path in zf.namelist():
-                if path.startswith('./'):
-                    tgt = os.path.join(out, path[2:])
-                else:
-                    tgt = os.path.join(out, path)
-
-                tgtdir = os.path.dirname(tgt)
-                if not os.path.exists(tgtdir):
-                    os.makedirs(tgtdir)
-                with open(tgt, 'wb') as fp:
-                    fp.write(zf.read(path))
+            zf.extractall(args[2])
 
     elif args[0] == '-c':
         if len(args) < 3:
diff -r a894b629bbea -r 7b933005c492 Misc/NEWS
--- a/Misc/NEWS	Sun Aug 17 12:20:02 2014 +0300
+++ b/Misc/NEWS	Sun Aug 17 15:14:48 2014 +0300
@@ -329,6 +329,9 @@
 Tools/Demos
 -----------
 
+- Issue #22201: Command-line interface of the zipfile module now correctly
+  extracts ZIP files with directory entries.  Patch by Ryan Wilson.
+
 - Issue #21906: Make Tools/scripts/md5sum.py work in Python 3.
   Patch by Zachary Ware.