Change _begin() back to begin().
Client code could create responses explicitly.
diff --git a/Lib/httplib.py b/Lib/httplib.py
index 1db930e..34ed2da 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -198,7 +198,6 @@
else:
self.status = self.status + '; bad seek'
break
-
class HTTPResponse:
@@ -260,7 +259,7 @@
raise BadStatusLine(line)
return version, status, reason
- def _begin(self):
+ def begin(self):
if self.msg is not None:
# we've already started reading the response
return
@@ -741,7 +740,7 @@
else:
response = self.response_class(self.sock, strict=self.strict)
- response._begin()
+ response.begin()
assert response.will_close != _UNKNOWN
self.__state = _CS_IDLE
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 1edb062..09f92fc 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -16,7 +16,7 @@
body = "HTTP/1.1 200 Ok\r\n\r\nText"
sock = FakeSocket(body)
resp = httplib.HTTPResponse(sock, 1)
-resp._begin()
+resp.begin()
print resp.read()
resp.close()
@@ -24,7 +24,7 @@
sock = FakeSocket(body)
resp = httplib.HTTPResponse(sock, 1)
try:
- resp._begin()
+ resp.begin()
except httplib.BadStatusLine:
print "BadStatusLine raised as expected"
else:
@@ -52,7 +52,7 @@
'Part_Number="Rocket_Launcher_0001"; Version="1"; Path="/acme"')
s = FakeSocket(text)
r = httplib.HTTPResponse(s, 1)
-r._begin()
+r.begin()
cookies = r.getheader("Set-Cookie")
if cookies != hdr:
raise AssertionError, "multiple headers not combined properly"