summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2015-07-10 19:26:08 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2015-07-10 19:26:08 (GMT)
commit05121159b3b8d2764847a2cff782bb9ecf773dc0 (patch)
tree089ff59e69051cd7352557e65f0656d13232a400
parent3d031e61994cf208fd1950791df16093582336cf (diff)
parentd44768ff16131c17bb9dc277840a94810a87b6a9 (diff)
downloadcpython-05121159b3b8d2764847a2cff782bb9ecf773dc0.zip
cpython-05121159b3b8d2764847a2cff782bb9ecf773dc0.tar.gz
cpython-05121159b3b8d2764847a2cff782bb9ecf773dc0.tar.bz2
Issue #24608: chunk.Chunk.read() now always returns bytes, not str.
-rw-r--r--Lib/chunk.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/chunk.py b/Lib/chunk.py
index 98187b2..84b77cc 100644
--- a/Lib/chunk.py
+++ b/Lib/chunk.py
@@ -128,7 +128,7 @@ class Chunk:
if self.closed:
raise ValueError("I/O operation on closed file")
if self.size_read >= self.chunksize:
- return ''
+ return b''
if size < 0:
size = self.chunksize - self.size_read
if size > self.chunksize - self.size_read:
diff --git a/Misc/NEWS b/Misc/NEWS
index da90361..aaa7f91 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,8 @@ Core and Builtins
Library
-------
+- Issue #24608: chunk.Chunk.read() now always returns bytes, not str.
+
- Issue #18684: Fixed reading out of the buffer in the re module.
- Issue #24259: tarfile now raises a ReadError if an archive is truncated