Issue #22219: The zipfile module CLI now adds entries for directories

(including empty directories) in ZIP file.
This commit is contained in:
Serhiy Storchaka 2014-10-04 13:39:34 +03:00
parent bf92bceaaa
commit 518e71b18a
2 changed files with 12 additions and 2 deletions

View File

@ -1790,14 +1790,21 @@ def main(args = None):
if os.path.isfile(path):
zf.write(path, zippath, ZIP_DEFLATED)
elif os.path.isdir(path):
if zippath:
zf.write(path, zippath)
for nm in os.listdir(path):
addToZip(zf,
os.path.join(path, nm), os.path.join(zippath, nm))
# else: ignore
with ZipFile(args[1], 'w') as zf:
for src in args[2:]:
addToZip(zf, src, os.path.basename(src))
for path in args[2:]:
zippath = os.path.basename(path)
if not zippath:
zippath = os.path.basename(os.path.dirname(path))
if zippath in ('', os.curdir, os.pardir):
zippath = ''
addToZip(zf, path, zippath)
if __name__ == "__main__":
main()

View File

@ -19,6 +19,9 @@ Core and Builtins
Library
-------
- Issue #22219: The zipfile module CLI now adds entries for directories
(including empty directories) in ZIP file.
- Issue #22449: In the ssl.SSLContext.load_default_certs, consult the
enviromental variables SSL_CERT_DIR and SSL_CERT_FILE on Windows.