From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 1 Jan 2017 17:00:30 +0000 (+0200)
Subject: Issue #29094: Offsets in a ZIP file created with extern file object and modes
X-Git-Tag: v3.5.3rc1~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34cba334034ddef3b32e47bf94cb7d224cfaf15d;p=python

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.
---

diff --git a/Lib/zipfile.py b/Lib/zipfile.py
index 2476717c96..048f60a708 100644
--- a/Lib/zipfile.py
+++ b/Lib/zipfile.py
@@ -1028,11 +1028,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 0dd4ef10f5..ad67b1da62 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -140,6 +140,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 #13051: Fixed recursion errors in large or resized
   curses.textpad.Textbox.  Based on patch by Tycho Andersen.