summaryrefslogtreecommitdiff
path: root/Lib/bz2.py
diff options
context:
space:
mode:
authorMa Lin <animalize@users.noreply.github.com>2021-06-22 15:04:23 +0800
committerGitHub <noreply@github.com>2021-06-22 10:04:23 +0300
commitbc6c12c72a9536acc96e7b9355fd69d1083a43c1 (patch)
tree6037ba6a1f6d777581124df4395a0b8a13472706 /Lib/bz2.py
parent92c2e91580521ba5c85aa3205a0211df5b48689b (diff)
downloadcpython-git-bc6c12c72a9536acc96e7b9355fd69d1083a43c1.tar.gz
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/bz2.py')
-rw-r--r--Lib/bz2.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/Lib/bz2.py b/Lib/bz2.py
index a2c588e748..7f1d20632e 100644
--- a/Lib/bz2.py
+++ b/Lib/bz2.py
@@ -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.