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

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 3a830182d6bc5cb2a64aa012554f672f8a317a95..05ddf12be6c32cd4a8b2f106d45fb2ed7e39cce2 100644 (file)
--- 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 632c2bc563f39ed823eecec0494f962b3f66eab2..9abeb61c9d03772e2cb45f47378229ed44226734 100644 (file)
--- 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()