mirror of
https://github.com/python/cpython
synced 2024-10-05 17:35:01 +00:00
#1710703: write zipfile structures also in the case of closing a new, but empty, archive.
This commit is contained in:
parent
77658bd9ad
commit
268e4d4cf3
|
@ -117,6 +117,10 @@ ZipFile Objects
|
|||
and :program:`unzip` commands on Unix (the InfoZIP utilities) don't support
|
||||
these extensions.
|
||||
|
||||
If the file is created with mode ``'a'`` or ``'w'`` and then
|
||||
:meth:`close`\ d without adding any files to the archive, the appropriate
|
||||
ZIP structures for an empty archive will be written to the file.
|
||||
|
||||
ZipFile is also a context manager and therefore supports the
|
||||
:keyword:`with` statement. In the example, *myzip* is closed after the
|
||||
:keyword:`with` statement's suite is finished---even if an exception occurs::
|
||||
|
|
|
@ -959,6 +959,31 @@ def test_read_return_size_stored(self):
|
|||
def test_read_return_size_deflated(self):
|
||||
self.check_read_return_size(zipfile.ZIP_DEFLATED)
|
||||
|
||||
def test_empty_zipfile(self):
|
||||
# Check that creating a file in 'w' or 'a' mode and closing without
|
||||
# adding any files to the archives creates a valid empty ZIP file
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="w")
|
||||
zipf.close()
|
||||
try:
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="r")
|
||||
except zipfile.BadZipFile:
|
||||
self.fail("Unable to create empty ZIP file in 'w' mode")
|
||||
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="a")
|
||||
zipf.close()
|
||||
try:
|
||||
zipf = zipfile.ZipFile(TESTFN, mode="r")
|
||||
except:
|
||||
self.fail("Unable to create empty ZIP file in 'a' mode")
|
||||
|
||||
def test_open_empty_file(self):
|
||||
# Issue 1710703: Check that opening a file with less than 22 bytes
|
||||
# raises a BadZipfile exception (rather than the previously unhelpful
|
||||
# IOError)
|
||||
f = open(TESTFN, 'w')
|
||||
f.close()
|
||||
self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN, 'r')
|
||||
|
||||
def tearDown(self):
|
||||
unlink(TESTFN)
|
||||
unlink(TESTFN2)
|
||||
|
|
|
@ -167,7 +167,13 @@ def _EndRecData64(fpin, offset, endrec):
|
|||
"""
|
||||
Read the ZIP64 end-of-archive records and use that to update endrec
|
||||
"""
|
||||
fpin.seek(offset - sizeEndCentDir64Locator, 2)
|
||||
try:
|
||||
fpin.seek(offset - sizeEndCentDir64Locator, 2)
|
||||
except IOError:
|
||||
# If the seek fails, the file is not large enough to contain a ZIP64
|
||||
# end-of-archive record, so just return the end record we were given.
|
||||
return endrec
|
||||
|
||||
data = fpin.read(sizeEndCentDir64Locator)
|
||||
sig, diskno, reloff, disks = struct.unpack(structEndArchive64Locator, data)
|
||||
if sig != stringEndArchive64Locator:
|
||||
|
@ -705,14 +711,22 @@ def __init__(self, file, mode="r", compression=ZIP_STORED, allowZip64=False):
|
|||
if key == 'r':
|
||||
self._GetContents()
|
||||
elif key == 'w':
|
||||
pass
|
||||
# set the modified flag so central directory gets written
|
||||
# even if no files are added to the archive
|
||||
self._didModify = True
|
||||
elif key == 'a':
|
||||
try: # See if file is a zip file
|
||||
try:
|
||||
# See if file is a zip file
|
||||
self._RealGetContents()
|
||||
# seek to start of directory and overwrite
|
||||
self.fp.seek(self.start_dir, 0)
|
||||
except BadZipfile: # file is not a zip file, just append
|
||||
except BadZipfile:
|
||||
# file is not a zip file, just append
|
||||
self.fp.seek(0, 2)
|
||||
|
||||
# set the modified flag so central directory gets written
|
||||
# even if no files are added to the archive
|
||||
self._didModify = True
|
||||
else:
|
||||
if not self._filePassed:
|
||||
self.fp.close()
|
||||
|
@ -739,7 +753,10 @@ def _GetContents(self):
|
|||
def _RealGetContents(self):
|
||||
"""Read in the table of contents for the ZIP file."""
|
||||
fp = self.fp
|
||||
endrec = _EndRecData(fp)
|
||||
try:
|
||||
endrec = _EndRecData(fp)
|
||||
except IOError:
|
||||
raise BadZipfile("File is not a zip file")
|
||||
if not endrec:
|
||||
raise BadZipfile("File is not a zip file")
|
||||
if self.debug > 1:
|
||||
|
|
|
@ -15,6 +15,10 @@ Core and Builtins
|
|||
Library
|
||||
-------
|
||||
|
||||
- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is
|
||||
created in modes 'a' or 'w' and then closed without adding any files. Raise
|
||||
BadZipfile (rather than IOError) when opening small non-ZIP files.
|
||||
|
||||
- Issue #10041: The signature of optional arguments in socket.makefile()
|
||||
didn't match that of io.open(), and they also didn't get forwarded
|
||||
properly to TextIOWrapper in text mode. Patch by Kai Zhu.
|
||||
|
|
Loading…
Reference in a new issue