From c82c4c34d8fceccc5942befa42440bbbe0359ac5 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sun, 17 Aug 2014 15:11:06 +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 +------------ Misc/NEWS | 6 ++++++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Lib/zipfile.py b/Lib/zipfile.py index a0beae2..fe71765 100644 --- a/Lib/zipfile.py +++ b/Lib/zipfile.py @@ -1492,18 +1492,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: diff --git a/Misc/NEWS b/Misc/NEWS index 86deb58..5f731bf 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -84,6 +84,12 @@ Extension Modules adds support for the Linux AArch64 and POWERPC ELF ABIv2 little endian architectures. +Tools/Demos +----------- + +- Issue #22201: Command-line interface of the zipfile module now correctly + extracts ZIP files with directory entries. Patch by Ryan Wilson. + Tests ----- -- cgit v0.12