From: Guido van Rossum <guido@python.org>
Date: Wed, 12 Sep 2007 19:43:09 +0000 (+0000)
Subject: Fix for bug 1148: str/bytes issue in httplib's _safe_read().
X-Git-Tag: v3.0a2~394
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a00f1237069233ac116c40c88ead2f5684629459;p=thirdparty%2FPython%2Fcpython.git

Fix for bug 1148: str/bytes issue in httplib's _safe_read().
---

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 3a830182d6bc..05ddf12be6c3 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:
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 632c2bc563f3..9abeb61c9d03 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -133,7 +133,7 @@ class BasicTest(TestCase):
             NoEOFStringIO)
         resp = httplib.HTTPResponse(sock, method="HEAD")
         resp.begin()
-        if resp.read() != "":
+        if resp.read():
             self.fail("Did not expect response from HEAD request")
         resp.close()