Skip to content

[3.7] bpo-34035: Fix several AttributeError in zipfile seek() methods. (GH-8527) #8556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miss-islington merged 1 commit into from
Jul 29, 2018
Merged

[3.7] bpo-34035: Fix several AttributeError in zipfile seek() methods. (GH-8527) #8556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/test/test_zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,6 +1646,8 @@ def test_seek_tell(self):
self.assertEqual(fp.read(5), txt[bloc:bloc+5])
fp.seek(0, os.SEEK_END)
self.assertEqual(fp.tell(), len(txt))
fp.seek(0, os.SEEK_SET)
self.assertEqual(fp.tell(), 0)
# Check seek on memory file
data = io.BytesIO()
with zipfile.ZipFile(data, mode="w") as zipf:
Expand All @@ -1661,6 +1663,8 @@ def test_seek_tell(self):
self.assertEqual(fp.read(5), txt[bloc:bloc+5])
fp.seek(0, os.SEEK_END)
self.assertEqual(fp.tell(), len(txt))
fp.seek(0, os.SEEK_SET)
self.assertEqual(fp.tell(), 0)

def tearDown(self):
unlink(TESTFN)
Expand Down
7 changes: 3 additions & 4 deletions Lib/zipfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,11 +701,11 @@ def __init__(self, file, pos, close, lock, writing):

def seek(self, offset, whence=0):
with self._lock:
if self.writing():
if self._writing():
raise ValueError("Can't reposition in the ZIP file while "
"there is an open writing handle on it. "
"Close the writing handle before trying to read.")
self._file.seek(self._pos)
self._file.seek(offset, whence)
self._pos = self._file.tell()
return self._pos

Expand Down Expand Up @@ -1021,14 +1021,13 @@ def seek(self, offset, whence=0):
read_offset = 0
elif read_offset < 0:
# Position is before the current position. Reset the ZipExtFile

self._fileobj.seek(self._orig_compress_start)
self._running_crc = self._orig_start_crc
self._compress_left = self._orig_compress_size
self._left = self._orig_file_size
self._readbuffer = b''
self._offset = 0
self._decompressor = zipfile._get_decompressor(self._compress_type)
self._decompressor = _get_decompressor(self._compress_type)
self._eof = False
read_offset = new_pos

Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1429,6 +1429,7 @@ Michael Schneider
Peter Schneider-Kamp
Arvin Schnell
Nofar Schnider
Mickaël Schoentgen
Ed Schouten
Scott Schram
Robin Schreiber
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2018-07-28-15-00-31.bpo-34035.75nW0H.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix several AttributeError in zipfile seek() methods. Patch by Mickaël Schoentgen.