From 97f17ff8405e1b6741ff1b1412befd0190896ae7 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 17 Aug 2014 15:14:48 +0300 Subject: Issue #22201: Command-line interface of the zipfile module now correctly extracts ZIP files with directory entries. Patch by Ryan Wilson. --- Lib/zipfile.py | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'Lib/zipfile.py') diff --git a/Lib/zipfile.py b/Lib/zipfile.py index ee228b1475..c57765753f 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1764,18 +1764,7 @@ def main(args = None): 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: -- cgit v1.2.1