Skip to content

bpo-38886: add option to zipfile.writestr to open permissions #17327

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

Open
raphaeldussin wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −3
Open

bpo-38886: add option to zipfile.writestr to open permissions #17327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39c5b50
add option to zipfile.writestr to open permissions
Nov 21, 2019
b3a5252
📜🤖 Added by blurb_it.
blurb-it[bot] Nov 22, 2019
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
8 changes: 8 additions & 0 deletions Lib/test/test_zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,14 @@ def test_writestr_compresslevel(self):
self.assertEqual(b_info.compress_type, self.compression)
self.assertEqual(b_info._compresslevel, 2)

def test_writestr_permission(self):
zipfp = zipfile.ZipFile(TESTFN2, "w")
zipfp.writestr("b.txt", "hello world", file_perm=0o755)
b_info = zipfp.getinfo('b.txt')
perm = oct(b_info.external_attr >> 16)
assert perm == '0o755'


def test_read_return_size(self):
# Issue #9837: ZipExtFile.read() shouldn't return more bytes
# than requested.
Expand Down
8 changes: 5 additions & 3 deletions Lib/zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,12 +1751,14 @@ def write(self, filename, arcname=None,
shutil.copyfileobj(src, dest, 1024*8)

def writestr(self, zinfo_or_arcname, data,
compress_type=None, compresslevel=None):
compress_type=None, compresslevel=None,
file_perm=0o600):
"""Write a file into the archive. The contents is 'data', which
may be either a 'str' or a 'bytes' instance; if it is a 'str',
it is encoded as UTF-8 first.
'zinfo_or_arcname' is either a ZipInfo instance or
the name of the file in the archive."""
the name of the file in the archive. Default permission is set to 600
(rw-------) but can be specified with file_perm."""
if isinstance(data, str):
data = data.encode("utf-8")
if not isinstance(zinfo_or_arcname, ZipInfo):
Expand All @@ -1768,7 +1770,7 @@ def writestr(self, zinfo_or_arcname, data,
zinfo.external_attr = 0o40775 << 16 # drwxrwxr-x
zinfo.external_attr |= 0x10 # MS-DOS directory flag
else:
zinfo.external_attr = 0o600 << 16 # ?rw-------
zinfo.external_attr = file_perm << 16 # ?rw-------
else:
zinfo = zinfo_or_arcname

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2019-11-22-15-31-12.bpo-38886.yLQRPS.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
add option to zipfile.writestr to open permissions: new optional argument
to allow user to choose permission of written file