Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions Lib/test/test_zipfile/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -5463,9 +5463,6 @@ def test_mkdir(self):

old_zinfo = zipfile.ZipInfo("directory4/")
old_zinfo.external_attr = (0o40777 << 16) | 0x10
old_zinfo.CRC = 0
old_zinfo.file_size = 0
old_zinfo.compress_size = 0
zf.mkdir(old_zinfo)
new_zinfo = zf.filelist[3]
self.assertEqual(old_zinfo.filename, "directory4/")
Expand All @@ -5476,6 +5473,32 @@ def test_mkdir(self):
zf.extractall(target)
self.assertEqual(set(os.listdir(target)), {"directory", "directory2", "directory3", "directory4"})

def test_mkdir_zipinfo_preserves_metadata(self):
zinfo = zipfile.ZipInfo("directory/", (2001, 2, 3, 4, 5, 6))
zinfo.compress_type = zipfile.ZIP_STORED
zinfo.compress_level = 1
zinfo.comment = b"comment"
zinfo.extra = b"\x99\x99\x00\x00"
zinfo.external_attr = (0o40700 << 16) | 0x10
zinfo.file_size = 1
zinfo.compress_size = 2

archive = io.BytesIO()
with zipfile.ZipFile(archive, "w") as zf:
zf.mkdir(zinfo)
self.assertEqual(zinfo.compress_level, 1)

self.assertEqual(zinfo.CRC, 0)
self.assertEqual(zinfo.file_size, 0)
self.assertEqual(zinfo.compress_size, 0)
with zipfile.ZipFile(archive) as zf:
written = zf.getinfo("directory/")
self.assertEqual(written.date_time, (2001, 2, 3, 4, 5, 6))
self.assertEqual(written.compress_type, zipfile.ZIP_STORED)
self.assertEqual(written.comment, b"comment")
self.assertEqual(written.extra, b"\x99\x99\x00\x00")
self.assertEqual(written.external_attr, (0o40700 << 16) | 0x10)

def test_create_directory_with_write(self):
with zipfile.ZipFile(TESTFN, "w") as zf:
zf.writestr(zipfile.ZipInfo('directory/'), '')
Expand Down
7 changes: 2 additions & 5 deletions Lib/zipfile/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2529,8 +2529,6 @@ def write(self, filename, arcname=None,
strict_timestamps=self._strict_timestamps)

if zinfo.is_dir():
zinfo.compress_size = 0
zinfo.CRC = 0
self.mkdir(zinfo)
else:
if compress_type is not None:
Expand Down Expand Up @@ -2590,14 +2588,13 @@ def mkdir(self, zinfo_or_directory_name, mode=511):
if not directory_name.endswith("/"):
directory_name += "/"
zinfo = ZipInfo(directory_name)
zinfo.compress_size = 0
zinfo.CRC = 0
zinfo.external_attr = ((0o40000 | mode) & 0xFFFF) << 16
zinfo.file_size = 0
zinfo.external_attr |= 0x10
else:
raise TypeError("Expected type str or ZipInfo")

zinfo.CRC = zinfo.compress_size = zinfo.file_size = 0

with self._lock:
if self._seekable:
self.fp.seek(self.start_dir)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix :meth:`zipfile.ZipFile.mkdir` failing with an :class:`zipfile.ZipInfo`
that does not already have a ``CRC`` attribute.
Loading