mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #14099: Restored support of writing ZIP files to tellable but

Browse source 
non-seekable streams.
This commit is contained in:
Serhiy Storchaka 2015-01-26 14:01:27 +02:00
parent f15e524026
commit a14f7d239f
3 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/zipfile.py
View file

@ -1504,7 +1504,14 @@ class ZipFile:
zinfo.file_size = len(data) # Uncompressed size
with self._lock:
self.fp.seek(self.start_dir, 0)
try:
self.fp.seek(self.start_dir)
except (AttributeError, io.UnsupportedOperation):
# Some file-like objects can provide tell() but not seek()
pass
zinfo.header_offset = self.fp.tell() # Start of header data
if compress_type is not None:
zinfo.compress_type = compress_type
zinfo.header_offset = self.fp.tell() # Start of header data
if compress_type is not None:
zinfo.compress_type = compress_type
@ -1550,7 +1557,11 @@ class ZipFile:
try:
if self.mode in ("w", "a") and self._didModify: # write ending records
with self._lock:
self.fp.seek(self.start_dir, 0)
try:
self.fp.seek(self.start_dir)
except (AttributeError, io.UnsupportedOperation):
# Some file-like objects can provide tell() but not seek()
pass
self._write_end_record()
finally:
fp = self.fp
@ -1558,7 +1569,6 @@ class ZipFile:
self._fpclose(fp)
def _write_end_record(self):
self.fp.seek(self.start_dir, 0)
for zinfo in self.filelist: # write central directory
dt = zinfo.date_time
dosdate = (dt[0] - 1980) << 9 | dt[1] << 5 | dt[2]