summaryrefslogtreecommitdiffstats
path: root/Lib/httplib.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-09-12 19:43:09 (GMT)
committerGuido van Rossum <guido@python.org>2007-09-12 19:43:09 (GMT)
commita00f1237069233ac116c40c88ead2f5684629459 (patch)
tree44d7954e8ef9d00624ccabfd0e82aa31a51b8f64 /Lib/httplib.py
parent138bcb569ea2a884acfa3c84bb64733ecea915e0 (diff)
downloadcpython-a00f1237069233ac116c40c88ead2f5684629459.zip
cpython-a00f1237069233ac116c40c88ead2f5684629459.tar.gz
cpython-a00f1237069233ac116c40c88ead2f5684629459.tar.bz2
Fix for bug 1148: str/bytes issue in httplib's _safe_read().
Diffstat (limited to 'Lib/httplib.py')
-rw-r--r--Lib/httplib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/httplib.py b/Lib/httplib.py
index 3a830182..05ddf12 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -624,7 +624,7 @@ class HTTPResponse:
raise IncompleteRead(s)
s.append(chunk)
amt -= len(chunk)
- return "".join(s)
+ return b"".join(s)
def getheader(self, name, default=None):
if self.msg is None: