8000 bpo-4833: Add ZipFile.mkdir by dignissimus · Pull Request #32160 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-4833: Add ZipFile.mkdir #32160

New issue < 8000 /summary>

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
merged 8 commits into from
Apr 5, 2022
Merged

bpo-4833: Add ZipFile.mkdir #32160

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6341b83
Add ZipFile.mkdir
dignissimus Mar 28, 2022
5c441ad
Add news entry
dignissimus Mar 28, 2022
cc3c76e
Remove example zip file
dignissimus Mar 28, 2022
1028df2
Allow directory ordering to vary in tests
dignissimus Mar 28, 2022
702f0d8
Move version directive to end of block
dignissimus Mar 29, 2022
4a93d15
Add fille type flag to ZipFile.mkdir, add ZipFIle.write directory tests
dignissimus Apr 1, 2022
0b4877a
Remove redundant file type mask application
dignissimus Apr 1, 2022
0387bfb
Amend new entry
dignissimus Apr 1, 2022
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 fille type flag to ZipFile.mkdir, add ZipFIle.write directory tests
  • Loading branch information
@dignissimus
dignissimus committed Apr 1, 2022
commit 4a93d152313e55819d50c6c1106c735895b70127
33 changes: 27 additions & 6 deletions Lib/test/test_zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2642,24 +2642,24 @@ def test_mkdir(self):
zf.mkdir("directory")
zinfo = zf.filelist[0]
self.assertEqual(zinfo.filename, "directory/")
self.assertEqual(zinfo.external_attr, (511 << 16) | 0x10)
self.assertEqual(zinfo.external_attr, (0o40777 << 16) | 0x10)

zf.mkdir("directory2/")
zinfo = zf.filelist[1]
self.assertEqual(zinfo.filename, "directory2/")
self.assertEqual(zinfo.external_attr, (511 << 16) | 0x10)
self.assertEqual(zinfo.external_attr, (0o40777 << 16) | 0x10)

zf.mkdir("directory3", mode=777)
zf.mkdir("directory3", mode=0o777)
zinfo = zf.filelist[2]
self.assertEqual(zinfo.filename, "directory3/")
self.assertEqual(zinfo.external_attr, (777 << 16) | 0x10)
self.assertEqual(zinfo.external_attr, (0o40777 << 16) | 0x10)

old_zinfo = zipfile.ZipInfo("directory4/")
old_zinfo.external_attr = (511 << 16) | 0x10
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, mode=777)
zf.mkdir(old_zinfo)
new_zinfo = zf.filelist[3]
self.assertEqual(old_zinfo.filename, "directory4/")
self.assertEqual(old_zinfo.external_attr, new_zinfo.external_attr)
Expand All @@ -2669,6 +2669,27 @@ def test_mkdir(self):
zf.extractall(target)
self.assertEqual(set(os.listdir(target)), {"directory", "directory2", "directory3", "directory4"})

def test_create_directory_with_write(self):
with zipfile.ZipFile(TESTFN, "w") as zf:
zf.writestr(zipfile.ZipInfo('directory/'), '')

zinfo = zf.filelist[0]
self.assertEqual(zinfo.filename, "directory/")

directory = os.path.join(TESTFN2, "directory2")
os.mkdir(directory)
mode = os.stat(directory).st_mode
zf.write(directory, arcname="directory2/")
zinfo = zf.filelist[1]
self.assertEqual(zinfo.filename, "directory2/")
self.assertEqual(zinfo.external_attr, ((0o40000 | mode) << 16) | 0x10)

target = os.path.join(TESTFN2, "target")
os.mkdir(target)
zf.extractall(target)

self.assertEqual(set(os.listdir(target)), {"directory", "directory2"})

def tearDown(self):
rmtree(TESTFN2)
if os.path.exists(TESTFN):
Expand Down
2 changes: 1 addition & 1 deletion Lib/zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1841,7 +1841,7 @@ def mkdir(self, zinfo_or_directory_name, mode=511):
zinfo = ZipInfo(directory_name)
zinfo.compress_size = 0
zinfo.CRC = 0
zinfo.external_attr = (mode & 0xFFFF) << 16
zinfo.external_attr = ((0o40000 | mode) & 0xFFFF) << 16
zinfo.file_size = 0
zinfo.external_attr |= 0x10
else:
Expand Down
0