summaryrefslogtreecommitdiffstats
path: root/Lib/zipfile.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-11-22 12:50:25 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-11-22 12:50:25 (GMT)
commit6e3d2ba269bc6495cf373bfd8f1c5b0030e6ce4a (patch)
tree7810423008be86a04cf98133dce1c49f7508e70a /Lib/zipfile.py
parent36e4f760f69a388b5a6097b2e9113dbd464dac90 (diff)
parent8bc792a602311e426cbd69293627fdc9287a5c7b (diff)
downloadcpython-6e3d2ba269bc6495cf373bfd8f1c5b0030e6ce4a.zip
cpython-6e3d2ba269bc6495cf373bfd8f1c5b0030e6ce4a.tar.gz
cpython-6e3d2ba269bc6495cf373bfd8f1c5b0030e6ce4a.tar.bz2
Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
entries. Patch by Dingyuan Wang.
Diffstat (limited to 'Lib/zipfile.py')
-rw-r--r--Lib/zipfile.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 2bd1007..bee00d0 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1444,7 +1444,9 @@ class ZipFile:
arcname += '/'
zinfo = ZipInfo(arcname, date_time)
zinfo.external_attr = (st[0] & 0xFFFF) << 16 # Unix attributes
- if compress_type is None:
+ if isdir:
+ zinfo.compress_type = ZIP_STORED
+ elif compress_type is None:
zinfo.compress_type = self.compression
else:
zinfo.compress_type = compress_type