mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Issue #20912: Now directories added to ZIP file have correct Unix and MS-DOS

Browse source 
directory attributes.
This commit is contained in:
Serhiy Storchaka 2014-09-23 22:40:23 +03:00
parent 026a399bf9
commit 46a34924e4
3 changed files with 50 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/zipfile.py
View file

@ -1356,6 +1356,7 @@ class ZipFile:
zinfo.file_size = 0
zinfo.compress_size = 0
zinfo.CRC = 0
zinfo.external_attr |= 0x10 # MS-DOS directory flag
self.filelist.append(zinfo)
self.NameToInfo[zinfo.filename] = zinfo
self.fp.write(zinfo.FileHeader(False))
@ -1416,7 +1417,11 @@ class ZipFile:
zinfo = ZipInfo(filename=zinfo_or_arcname,
date_time=time.localtime(time.time())[:6])
zinfo.compress_type = self.compression
zinfo.external_attr = 0o600 << 16
if zinfo.filename[-1] == '/':
zinfo.external_attr = 0o40775 << 16 # drwxrwxr-x
zinfo.external_attr |= 0x10 # MS-DOS directory flag
else:
zinfo.external_attr = 0o600 << 16 # ?rw-------
else:
zinfo = zinfo_or_arcname