Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
8bc792a6
Commit
8bc792a6
authored
Nov 22, 2015
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
entries. Patch by Dingyuan Wang.
parent
04d759b1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
1 deletion
+30
-1
Lib/test/test_shutil.py
Lib/test/test_shutil.py
+23
-0
Lib/zipfile.py
Lib/zipfile.py
+3
-1
Misc/ACKS
Misc/ACKS
+1
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/test/test_shutil.py
View file @
8bc792a6
...
...
@@ -1099,6 +1099,29 @@ class TestShutil(unittest.TestCase):
names2
=
zf
.
namelist
()
self
.
assertEqual
(
sorted
(
names
),
sorted
(
names2
))
@
requires_zlib
@
unittest
.
skipUnless
(
ZIP_SUPPORT
,
'Need zip support to run'
)
@
unittest
.
skipUnless
(
shutil
.
which
(
'unzip'
),
'Need the unzip command to run'
)
def
test_unzip_zipfile
(
self
):
root_dir
,
base_dir
=
self
.
_create_files
()
base_name
=
os
.
path
.
join
(
self
.
mkdtemp
(),
'archive'
)
archive
=
make_archive
(
base_name
,
'zip'
,
root_dir
,
base_dir
)
# check if ZIP file was created
self
.
assertEqual
(
archive
,
base_name
+
'.zip'
)
self
.
assertTrue
(
os
.
path
.
isfile
(
archive
))
# now check the ZIP file using `unzip -t`
zip_cmd
=
[
'unzip'
,
'-t'
,
archive
]
with
support
.
change_cwd
(
root_dir
):
try
:
subprocess
.
check_output
(
zip_cmd
,
stderr
=
subprocess
.
STDOUT
)
except
subprocess
.
CalledProcessError
as
exc
:
details
=
exc
.
output
.
decode
(
errors
=
"replace"
)
msg
=
"{}
\
n
\
n
**Unzip Output**
\
n
{}"
self
.
fail
(
msg
.
format
(
exc
,
details
))
def
test_make_archive
(
self
):
tmpdir
=
self
.
mkdtemp
()
base_name
=
os
.
path
.
join
(
tmpdir
,
'archive'
)
...
...
Lib/zipfile.py
View file @
8bc792a6
...
...
@@ -1337,7 +1337,9 @@ class ZipFile:
arcname
+=
'/'
zinfo
=
ZipInfo
(
arcname
,
date_time
)
zinfo
.
external_attr
=
(
st
[
0
]
&
0xFFFF
)
<<
16
# Unix attributes
if
compress_type
is
None
:
if
isdir
:
zinfo
.
compress_type
=
ZIP_STORED
elif
compress_type
is
None
:
zinfo
.
compress_type
=
self
.
compression
else
:
zinfo
.
compress_type
=
compress_type
...
...
Misc/ACKS
View file @
8bc792a6
...
...
@@ -1471,6 +1471,7 @@ Richard Walker
Larry Wall
Kevin Walzer
Rodrigo Steinmuller Wanderley
Dingyuan Wang
Ke Wang
Greg Ward
Tom Wardill
...
...
Misc/NEWS
View file @
8bc792a6
...
...
@@ -106,6 +106,9 @@ Core and Builtins
Library
-------
- Issue #25624: ZipFile now always writes a ZIP_STORED header for directory
entries. Patch by Dingyuan Wang.
- Issue #25583: Avoid incorrect errors raised by os.makedirs(exist_ok=True)
when the OS gives priority to errors such as EACCES over EEXIST.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment