Author: jeremy.hylton
Date: Sat Aug 4 04:34:24 2007
New Revision: 56720
Modified:
python/branches/py3k-struni/Lib/httplib.py
Log:
HTTPResponse should not inherit from io.IOBase.
I'm not sure why I thought it should originally, but it introduces an
__del__() method on the response which cause the close() to be called
too soon using the HTTP compat class.
Also, remove some stale comments. The HTTPResponse calls makefile()
immediately, so there is no risk of it closing the socket.
Modified: python/branches/py3k-struni/Lib/httplib.py
==============================================================================
--- python/branches/py3k-struni/Lib/httplib.py (original)
+++ python/branches/py3k-struni/Lib/httplib.py Sat Aug 4 04:34:24 2007
@@ -308,7 +308,7 @@
self.status = self.status + '; bad seek'
break
-class HTTPResponse(io.IOBase):
+class HTTPResponse:
# strict: If true, raise BadStatusLine if the status line can't be
# parsed as a valid HTTP/1.0 or 1.1 status line. By default it is
@@ -1205,10 +1205,6 @@
try:
response = self._conn.getresponse()
except BadStatusLine as e:
- ### hmm. if getresponse() ever closes the socket on a bad request,
- ### then we are going to have problems with self.sock
-
- ### should we keep this behavior? do people use it?
# keep the socket open (as a file), and return it
self.file = self._conn.sock.makefile('rb', 0)
@@ -1399,7 +1395,7 @@
status, reason, headers = h.getreply()
print('status =', status)
print('reason =', reason)
- print("read", len(h.getfile().read()))
+ print('read', len(h.getfile().read()))
print()
if headers:
for header in headers.headers: print(header.strip())
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
