[Python-3000-checkins] r58126 - in python/branches/py3k/Lib: httplib.py test/test_httplib.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Wed Sep 12 21:43:09 2007
New Revision: 58126

Modified:
   python/branches/py3k/Lib/httplib.py
   python/branches/py3k/Lib/test/test_httplib.py
Log:
Fix for bug 1148: str/bytes issue in httplib's _safe_read().


Modified: python/branches/py3k/Lib/httplib.py
==============================================================================
--- python/branches/py3k/Lib/httplib.py	(original)
+++ python/branches/py3k/Lib/httplib.py	Wed Sep 12 21:43:09 2007
@@ -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:

Modified: python/branches/py3k/Lib/test/test_httplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_httplib.py	(original)
+++ python/branches/py3k/Lib/test/test_httplib.py	Wed Sep 12 21:43:09 2007
@@ -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()