commit a00f1237069233ac116c40c88ead2f5684629459
author Guido van Rossum <guido@python.org> Wed Sep 12 19:43:09 2007 +0000
committer Guido van Rossum <guido@python.org> Wed Sep 12 19:43:09 2007 +0000
tree 44d7954e8ef9d00624ccabfd0e82aa31a51b8f64
parent 138bcb569ea2a884acfa3c84bb64733ecea915e0

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

Lib/httplib.py

diff --git a/Lib/httplib.py b/Lib/httplib.py
index 3a83018..05ddf12 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -624,7 +624,7 @@
                 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:

Lib/test/test_httplib.py

diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 632c2bc..9abeb61 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -133,7 +133,7 @@
             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()