mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Change _begin() back to begin().

Browse source 
Client code could create responses explicitly.
This commit is contained in:
Jeremy Hylton 2002-07-12 14:04:09 +00:00
parent dd523eef95
commit 39c03808c7
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/httplib.py
View file

@ -198,7 +198,6 @@ class HTTPMessage(mimetools.Message):
else: else:
self.status = self.status + '; bad seek' self.status = self.status + '; bad seek'
break break
class HTTPResponse: class HTTPResponse:
@ -260,7 +259,7 @@ class HTTPResponse:
raise BadStatusLine(line) raise BadStatusLine(line)
return version, status, reason return version, status, reason
def _begin(self): def begin(self):
if self.msg is not None: if self.msg is not None:
# we've already started reading the response # we've already started reading the response
return return
@ -741,7 +740,7 @@ class HTTPConnection:
else: else:
response = self.response_class(self.sock, strict=self.strict) response = self.response_class(self.sock, strict=self.strict)
response._begin() response.begin()
assert response.will_close != _UNKNOWN assert response.will_close != _UNKNOWN
self.__state = _CS_IDLE self.__state = _CS_IDLE

6
Lib/test/test_httplib.py
View file

@ -16,7 +16,7 @@ class FakeSocket:
body = "HTTP/1.1 200 Ok\r\n\r\nText" body = "HTTP/1.1 200 Ok\r\n\r\nText"
sock = FakeSocket(body) sock = FakeSocket(body)
resp = httplib.HTTPResponse(sock, 1) resp = httplib.HTTPResponse(sock, 1)
resp._begin() resp.begin()
print resp.read() print resp.read()
resp.close() resp.close()
@ -24,7 +24,7 @@ body = "HTTP/1.1 400.100 Not Ok\r\n\r\nText"
sock = FakeSocket(body) sock = FakeSocket(body)
resp = httplib.HTTPResponse(sock, 1) resp = httplib.HTTPResponse(sock, 1)
try: try:
resp._begin() resp.begin()
except httplib.BadStatusLine: except httplib.BadStatusLine:
print "BadStatusLine raised as expected" print "BadStatusLine raised as expected"
else: else:
@ -52,7 +52,7 @@ hdr = ('Customer="WILE_E_COYOTE"; Version="1"; Path="/acme"'
'Part_Number="Rocket_Launcher_0001"; Version="1"; Path="/acme"') 'Part_Number="Rocket_Launcher_0001"; Version="1"; Path="/acme"')
s = FakeSocket(text) s = FakeSocket(text)
r = httplib.HTTPResponse(s, 1) r = httplib.HTTPResponse(s, 1)
r._begin() r.begin()
cookies = r.getheader("Set-Cookie") cookies = r.getheader("Set-Cookie")
if cookies != hdr: if cookies != hdr:
raise AssertionError, "multiple headers not combined properly" raise AssertionError, "multiple headers not combined properly"