summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-01-01 17:05:29 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2017-01-01 17:05:29 (GMT)
commite465a9af8e87aa2c4c20dfaa23b310827c2ec345 (patch)
tree102effb7bae6bdd6b547eb7d9b1d9dc292146b3d
parent75d9016530369999e099a247f260f76f544dc20d (diff)
parent34cba334034ddef3b32e47bf94cb7d224cfaf15d (diff)
downloadcpython-e465a9af8e87aa2c4c20dfaa23b310827c2ec345.zip
cpython-e465a9af8e87aa2c4c20dfaa23b310827c2ec345.tar.gz
cpython-e465a9af8e87aa2c4c20dfaa23b310827c2ec345.tar.bz2
Issue #29094: Offsets in a ZIP file created with extern file object and modes
"w" and "x" now are relative to the start of the file.
-rw-r--r--Lib/zipfile.py5
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index e2ae042..7f2b43c 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1102,11 +1102,12 @@ class ZipFile:
# set the modified flag so central directory gets written
# even if no files are added to the archive
self._didModify = True
+ self._start_disk = 0
try:
- self.start_dir = self._start_disk = self.fp.tell()
+ self.start_dir = self.fp.tell()
except (AttributeError, OSError):
self.fp = _Tellable(self.fp)
- self.start_dir = self._start_disk = 0
+ self.start_dir = 0
self._seekable = False
else:
# Some file-like objects can provide tell() but not seek()
diff --git a/Misc/NEWS b/Misc/NEWS
index b1b3c69..a8d4ee8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -40,6 +40,9 @@ Core and Builtins
Library
-------
+- Issue #29094: Offsets in a ZIP file created with extern file object and modes
+ "w" and "x" now are relative to the start of the file.
+
- Issue #29085: Allow random.Random.seed() to use high quality OS randomness
rather than the pid and time.