bpo-44439: _ZipWriteFile.write() handle buffer protocol correctly (GH-29468)

Co-authored-by: Marco Ribeiro <marcoffee@users.noreply.github.com>
(cherry picked from commit 36dd7396fc)

Co-authored-by: Ma Lin <animalize@users.noreply.github.com>
This commit is contained in:
Miss Islington (bot) 2022-03-08 02:04:54 -08:00 committed by GitHub
parent 89c360125b
commit 0663ca17f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions

View file

@ -1,3 +1,4 @@
import array
import contextlib import contextlib
import importlib.util import importlib.util
import io import io
@ -1117,6 +1118,14 @@ def test_write_after_close(self):
self.assertRaises(ValueError, w.write, b'') self.assertRaises(ValueError, w.write, b'')
self.assertEqual(zipf.read('test'), data) self.assertEqual(zipf.read('test'), data)
def test_issue44439(self):
q = array.array('Q', [1, 2, 3, 4, 5])
LENGTH = len(q) * q.itemsize
with zipfile.ZipFile(io.BytesIO(), 'w', self.compression) as zip:
with zip.open('data', 'w') as data:
self.assertEqual(data.write(q), LENGTH)
self.assertEqual(zip.getinfo('data').file_size, LENGTH)
class StoredWriterTests(AbstractWriterTests, unittest.TestCase): class StoredWriterTests(AbstractWriterTests, unittest.TestCase):
compression = zipfile.ZIP_STORED compression = zipfile.ZIP_STORED

View file

@ -1120,8 +1120,15 @@ def writable(self):
def write(self, data): def write(self, data):
if self.closed: if self.closed:
raise ValueError('I/O operation on closed file.') raise ValueError('I/O operation on closed file.')
nbytes = len(data)
# Accept any data that supports the buffer protocol
if isinstance(data, (bytes, bytearray)):
nbytes = len(data)
else:
data = memoryview(data)
nbytes = data.nbytes
self._file_size += nbytes self._file_size += nbytes
self._crc = crc32(data, self._crc) self._crc = crc32(data, self._crc)
if self._compressor: if self._compressor:
data = self._compressor.compress(data) data = self._compressor.compress(data)

View file

@ -0,0 +1,2 @@
Fix ``.write()`` method of a member file in ``ZipFile``, when the input data is
an object that supports the buffer protocol, the file length may be wrong.