diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-06-22 13:59:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 13:59:53 (GMT) |
| commit | 01858fbe31e8e0185edfbd3f10172f7c61391c9d (patch) | |
| tree | 64698776a22ee2514d6ea7c75f101cda254ebf0a /Lib/bz2.py | |
| parent | cf739332bd039cd2303b58663a804f784883820d (diff) | |
| download | cpython-01858fbe31e8e0185edfbd3f10172f7c61391c9d.zip cpython-01858fbe31e8e0185edfbd3f10172f7c61391c9d.tar.gz cpython-01858fbe31e8e0185edfbd3f10172f7c61391c9d.tar.bz2 | |
bpo-44439: BZ2File.write() / LZMAFile.write() handle buffer protocol correctly (GH-26764) (GH-26845)
No longer use len() to get the length of the input data. For some buffer protocol objects,
the length obtained by using len() is wrong.
(cherry picked from commit bc6c12c72a9536acc96e7b9355fd69d1083a43c1)
Co-authored-by: Ma Lin <animalize@users.noreply.github.com>
Diffstat (limited to 'Lib/bz2.py')
| -rw-r--r-- | Lib/bz2.py | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -219,14 +219,22 @@ class BZ2File(_compression.BaseStream): """Write a byte string to the file. Returns the number of uncompressed bytes written, which is - always len(data). Note that due to buffering, the file on disk - may not reflect the data written until close() is called. + always the length of data in bytes. Note that due to buffering, + the file on disk may not reflect the data written until close() + is called. """ self._check_can_write() + if isinstance(data, (bytes, bytearray)): + length = len(data) + else: + # accept any data that supports the buffer protocol + data = memoryview(data) + length = data.nbytes + compressed = self._compressor.compress(data) self._fp.write(compressed) - self._pos += len(data) - return len(data) + self._pos += length + return length def writelines(self, seq): """Write a sequence of byte strings to the file. |
