summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorJeremy Hylton <jeremy@alum.mit.edu>2002-07-12 14:04:09 (GMT)
committerJeremy Hylton <jeremy@alum.mit.edu>2002-07-12 14:04:09 (GMT)
commit39c03808c753457992dc931e1dd08a65e72a9a8f (patch)
tree9ddebc40369e5ca30862aa4df3b9fc13687375a3 /Lib
parentdd523eef957bc1e4e1376dafde16b4dd81a3b9b7 (diff)
downloadcpython-39c03808c753457992dc931e1dd08a65e72a9a8f.zip
cpython-39c03808c753457992dc931e1dd08a65e72a9a8f.tar.gz
cpython-39c03808c753457992dc931e1dd08a65e72a9a8f.tar.bz2
Change _begin() back to begin().
Client code could create responses explicitly.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/httplib.py5
-rw-r--r--Lib/test/test_httplib.py6
2 files changed, 5 insertions, 6 deletions
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 @@ class HTTPMessage(mimetools.Message):
else:
self.status = self.status + '; bad seek'
break
-
class HTTPResponse:
@@ -260,7 +259,7 @@ class HTTPResponse:
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 @@ class HTTPConnection:
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 @@ class FakeSocket:
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 @@ body = "HTTP/1.1 400.100 Not Ok\r\n\r\nText"
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 @@ hdr = ('Customer="WILE_E_COYOTE"; Version="1"; Path="/acme"'
'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"