diff options
author | Ma Lin <animalize@users.noreply.github.com> | 2021-06-22 07:04:23 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-22 07:04:23 (GMT) |
commit | bc6c12c72a9536acc96e7b9355fd69d1083a43c1 (patch) | |
tree | 6037ba6a1f6d777581124df4395a0b8a13472706 /Lib/lzma.py | |
parent | 92c2e91580521ba5c85aa3205a0211df5b48689b (diff) | |
download | cpython-bc6c12c72a9536acc96e7b9355fd69d1083a43c1.zip cpython-bc6c12c72a9536acc96e7b9355fd69d1083a43c1.tar.gz cpython-bc6c12c72a9536acc96e7b9355fd69d1083a43c1.tar.bz2 |
bpo-44439: BZ2File.write() / LZMAFile.write() handle buffer protocol correctly (GH-26764)
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.
Diffstat (limited to 'Lib/lzma.py')
-rw-r--r-- | Lib/lzma.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Lib/lzma.py b/Lib/lzma.py index 2ada7d8..9abf06d 100644 --- a/Lib/lzma.py +++ b/Lib/lzma.py @@ -229,14 +229,22 @@ class LZMAFile(_compression.BaseStream): """Write a bytes object 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 seek(self, offset, whence=io.SEEK_SET): """Change the file position. |