Issue #19053: ZipExtFile.read1() with non-zero argument no more returns empty

bytes until end of data.
This commit is contained in:
Serhiy Storchaka 2013-09-27 22:14:31 +03:00
commit ab25c7c011
3 changed files with 57 additions and 8 deletions

View File

@ -158,6 +158,45 @@ class AbstractTestsWithSourceFile:
for f in get_files(self):
self.zip_random_open_test(f, self.compression)
def zip_read1_test(self, f, compression):
self.make_test_archive(f, compression)
# Read the ZIP archive
with zipfile.ZipFile(f, "r") as zipfp, \
zipfp.open(TESTFN) as zipopen:
zipdata = []
while True:
read_data = zipopen.read1(-1)
if not read_data:
break
zipdata.append(read_data)
self.assertEqual(b''.join(zipdata), self.data)
def test_read1(self):
for f in get_files(self):
self.zip_read1_test(f, self.compression)
def zip_read1_10_test(self, f, compression):
self.make_test_archive(f, compression)
# Read the ZIP archive
with zipfile.ZipFile(f, "r") as zipfp, \
zipfp.open(TESTFN) as zipopen:
zipdata = []
while True:
read_data = zipopen.read1(10)
self.assertLessEqual(len(read_data), 10)
if not read_data:
break
zipdata.append(read_data)
self.assertEqual(b''.join(zipdata), self.data)
def test_read1_10(self):
for f in get_files(self):
self.zip_read1_10_test(f, self.compression)
def zip_readline_read_test(self, f, compression):
self.make_test_archive(f, compression)

View File

@ -785,8 +785,11 @@ class ZipExtFile(io.BufferedIOBase):
buf = self._readbuffer[self._offset:]
self._readbuffer = b''
self._offset = 0
data = self._read1(self.MAX_N)
buf += data
while not self._eof:
data = self._read1(self.MAX_N)
if data:
buf += data
break
return buf
end = n + self._offset
@ -800,12 +803,16 @@ class ZipExtFile(io.BufferedIOBase):
self._readbuffer = b''
self._offset = 0
if n > 0:
data = self._read1(n)
if n < len(data):
self._readbuffer = data
self._offset = n
data = data[:n]
buf += data
while not self._eof:
data = self._read1(n)
if n < len(data):
self._readbuffer = data
self._offset = n
buf += data[:n]
break
if data:
buf += data
break
return buf
def _read1(self, n):

View File

@ -15,6 +15,9 @@ Core and Builtins
Library
-------
- Issue #19053: ZipExtFile.read1() with non-zero argument no more returns empty
bytes until end of data.
- logging: added support for Unix domain sockets to SocketHandler and
DatagramHandler.