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
77b112cd
Commit
77b112cd
authored
Aug 31, 2018
by
Marcel Plch
Committed by
Victor Stinner
Aug 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-34097: Polish API design (GH-8725)
Move strict_timestamps to constructor.
parent
1b5f9c96
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
18 deletions
+19
-18
Doc/library/zipfile.rst
Doc/library/zipfile.rst
+11
-10
Lib/test/test_zipfile.py
Lib/test/test_zipfile.py
+4
-4
Lib/zipfile.py
Lib/zipfile.py
+4
-4
No files found.
Doc/library/zipfile.rst
View file @
77b112cd
...
...
@@ -131,7 +131,7 @@ ZipFile Objects
.. class:: ZipFile(file, mode='
r
', compression=ZIP_STORED, allowZip64=True, \
compresslevel=None)
compresslevel=None
, *, strict_timestamps=True
)
Open a ZIP file, where *file* can be a path to a file (a string), a
file-like object or a :term:`path-like object`.
...
...
@@ -169,6 +169,12 @@ ZipFile Objects
When using :const:`ZIP_BZIP2` integers ``1`` through ``9`` are accepted
(see :class:`bz2 <bz2.BZ2File>` for more information).
The *strict_timestamps* argument, when set to ``False``, allows to
zip files older than 1980-01-01 at the cost of setting the
timestamp to 1980-01-01.
Similar behavior occurs with files newer than 2107-12-31,
the timestamp is also set to the limit.
If the file is created with mode ``'
w
'``, ``'
x
'`` or ``'
a
'`` and then
:meth:`closed <close>` without adding any files to the archive, the appropriate
ZIP structures for an empty archive will be written to the file.
...
...
@@ -203,6 +209,9 @@ ZipFile Objects
..
versionchanged
::
3.7
Add
the
*
compresslevel
*
parameter
.
..
versionadded
::
3.8
The
*
strict_timestamps
*
keyword
-
only
argument
..
method
::
ZipFile
.
close
()
...
...
@@ -368,7 +377,7 @@ ZipFile Objects
.. method:: ZipFile.write(filename, arcname=None, compress_type=None, \
compresslevel=None
, *, strict_timestamps=True
)
compresslevel=None)
Write the file named *filename* to the archive, giving it the archive name
*arcname* (by default, this will be the same as *filename*, but without a drive
...
...
@@ -377,11 +386,6 @@ ZipFile Objects
the new entry. Similarly, *compresslevel* will override the constructor if
given.
The archive must be open with mode ``'w'``, ``'x'`` or ``'a'``.
The *strict_timestamps* argument, when set to ``False``, allows to
zip files older than 1980-01-01 at the cost of setting the
timestamp to 1980-01-01.
Similar behavior occurs with files newer than 2107-12-31,
the timestamp is also set to the limit.
.. note::
...
...
@@ -405,9 +409,6 @@ ZipFile Objects
a closed ZipFile will raise a :exc:`ValueError`. Previously,
a :exc:`RuntimeError` was raised.
.. versionadded:: 3.8
The *strict_timestamps* keyword-only argument
.. method:: ZipFile.writestr(zinfo_or_arcname, data, compress_type=None, \
compresslevel=None)
...
...
Lib/test/test_zipfile.py
View file @
77b112cd
...
...
@@ -549,8 +549,8 @@ class StoredTestsWithSourceFile(AbstractTestsWithSourceFile,
with
zipfile
.
ZipFile
(
TESTFN2
,
"w"
)
as
zipfp
:
self
.
assertRaises
(
ValueError
,
zipfp
.
write
,
TESTFN
)
with
zipfile
.
ZipFile
(
TESTFN2
,
"w"
)
as
zipfp
:
zipfp
.
write
(
TESTFN
,
strict_timestamps
=
False
)
with
zipfile
.
ZipFile
(
TESTFN2
,
"w"
,
strict_timestamps
=
False
)
as
zipfp
:
zipfp
.
write
(
TESTFN
)
zinfo
=
zipfp
.
getinfo
(
TESTFN
)
self
.
assertEqual
(
zinfo
.
date_time
,
(
1980
,
1
,
1
,
0
,
0
,
0
))
...
...
@@ -564,8 +564,8 @@ class StoredTestsWithSourceFile(AbstractTestsWithSourceFile,
with
zipfile
.
ZipFile
(
TESTFN2
,
"w"
)
as
zipfp
:
self
.
assertRaises
(
struct
.
error
,
zipfp
.
write
,
TESTFN
)
with
zipfile
.
ZipFile
(
TESTFN2
,
"w"
)
as
zipfp
:
zipfp
.
write
(
TESTFN
,
strict_timestamps
=
False
)
with
zipfile
.
ZipFile
(
TESTFN2
,
"w"
,
strict_timestamps
=
False
)
as
zipfp
:
zipfp
.
write
(
TESTFN
)
zinfo
=
zipfp
.
getinfo
(
TESTFN
)
self
.
assertEqual
(
zinfo
.
date_time
,
(
2107
,
12
,
31
,
23
,
59
,
59
))
...
...
Lib/zipfile.py
View file @
77b112cd
...
...
@@ -1151,7 +1151,7 @@ class ZipFile:
_windows_illegal_name_trans_table
=
None
def
__init__
(
self
,
file
,
mode
=
"r"
,
compression
=
ZIP_STORED
,
allowZip64
=
True
,
compresslevel
=
None
):
compresslevel
=
None
,
*
,
strict_timestamps
=
True
):
"""Open the ZIP file with mode read 'r', write 'w', exclusive create 'x',
or append 'a'."""
if
mode
not
in
(
'r'
,
'w'
,
'x'
,
'a'
):
...
...
@@ -1169,6 +1169,7 @@ class ZipFile:
self
.
mode
=
mode
self
.
pwd
=
None
self
.
_comment
=
b''
self
.
_strict_timestamps
=
strict_timestamps
# Check if we were passed a file-like object
if
isinstance
(
file
,
os
.
PathLike
):
...
...
@@ -1677,8 +1678,7 @@ class ZipFile:
" would require ZIP64 extensions"
)
def
write
(
self
,
filename
,
arcname
=
None
,
compress_type
=
None
,
compresslevel
=
None
,
*
,
strict_timestamps
=
True
):
compress_type
=
None
,
compresslevel
=
None
):
"""Put the bytes from filename into the archive under the name
arcname."""
if
not
self
.
fp
:
...
...
@@ -1690,7 +1690,7 @@ class ZipFile:
)
zinfo
=
ZipInfo
.
from_file
(
filename
,
arcname
,
strict_timestamps
=
strict_timestamps
)
strict_timestamps
=
s
elf
.
_s
trict_timestamps
)
if
zinfo
.
is_dir
():
zinfo
.
compress_size
=
0
...
...
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