From a00f1237069233ac116c40c88ead2f5684629459 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 12 Sep 2007 19:43:09 +0000 Subject: [PATCH] Fix for bug 1148: str/bytes issue in httplib's _safe_read(). --- Lib/httplib.py | 2 +- Lib/test/test_httplib.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/httplib.py b/Lib/httplib.py index 3a830182d6..05ddf12be6 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 632c2bc563..9abeb61c9d 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() -- 2.49.0