Commit a88cb7de authored by Guido van Rossum's avatar Guido van Rossum

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

parent 62816345
......@@ -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:
......
......@@ -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()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment