Skip to content

gh-123424: add ZipInfo._for_archive to set suitable default properties #123429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaraco merged 8 commits into from
Dec 29, 2024
Merged

gh-123424: add ZipInfo._for_archive to set suitable default properties #123429

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b95cceb
add `ZipFile.for_name` helper
picnixz Aug 28, 2024
4acd888
add tests
picnixz Aug 28, 2024
d6c594b
blurb
picnixz Aug 28, 2024
b97016f
add What's New entry
picnixz Aug 28, 2024
91a421e
update docs
picnixz Aug 28, 2024
2af18d8
fix tests
picnixz Aug 28, 2024
a8f6a9f
Merge branch 'main' into feat/zipfile-for-name-123424
jaraco Dec 29, 2024
44e7b75
To avoid passthrough parameters, use _for_archive to mutate a constru…
jaraco Dec 29, 2024
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
Prev Previous commit
Next Next commit
add tests
  • Loading branch information
@picnixz
picnixz committed Aug 28, 2024
commit 4acd888a4d52b1124d6366c771658c0acee80325
29 changes: 29 additions & 0 deletions Lib/test/test_zipfile/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import itertools
import os
import posixpath
import stat
import struct
import subprocess
import sys
Expand Down Expand Up @@ -2205,6 +2206,34 @@ def test_create_empty_zipinfo_repr(self):
zi = zipfile.ZipInfo(filename="empty")
self.assertEqual(repr(zi), "<ZipInfo filename='empty' file_size=0>")

def test_create_zipinfo_for_name(self):
base_filename = TESTFN2.rstrip('/')

with zipfile.ZipFile(TESTFN, mode="w", compresslevel=1,
compression=zipfile.ZIP_DEFLATED) as zf:
# no trailing forward slash
zi = zipfile.ZipInfo.for_name(base_filename, zf)
self.assertEqual(zi.compress_level, 1)
self.assertEqual(zi.compress_type, zipfile.ZIP_DEFLATED)
# ?rw- --- ---
filemode = stat.S_IRUSR | stat.S_IWUSR
# filemode is stored as the highest 16 bits of external_attr
self.assertEqual(zi.external_attr >> 16, filemode)
self.assertEqual(zi.external_attr & 0xFF, 0) # no MS-DOS flag

with zipfile.ZipFile(TESTFN, mode="w", compresslevel=1,
compression=zipfile.ZIP_DEFLATED) as zf:
# with a trailing slash
zi = zipfile.ZipInfo.for_name(f'{base_filename}/', zf)
self.assertEqual(zi.compress_level, 1)
self.assertEqual(zi.compress_type, zipfile.ZIP_DEFLATED)
# d rwx rwx r-x
filemode = stat.S_IFDIR
filemode |= stat.S_IRWXU | stat.S_IRWXG
filemode |= stat.S_IROTH | stat.S_IXOTH
self.assertEqual(zi.external_attr >> 16, filemode)
self.assertEqual(zi.external_attr & 0xFF, 0x10) # MS-DOS flag

def test_create_empty_zipinfo_default_attributes(self):
"""Ensure all required attributes are set."""
zi = zipfile.ZipInfo()
Expand Down