Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 14:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix test_httplib.

Browse source
This commit is contained in:
Martin v. Löwis 2007-06-30 09:22:09 +00:00
parent 486364b821
commit dd5a86070c
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/httplib.py
View file

@ -711,8 +711,8 @@ def _send_output(self):
Appends an extra \\r\\n to the buffer.
"""
self._buffer.extend(("", ""))
msg = "\r\n".join(self._buffer)
self._buffer.extend((b"", b""))
msg = b"\r\n".join(self._buffer)
del self._buffer[:]
self.send(msg)
@ -758,9 +758,10 @@ def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0):
self._method = method
if not url:
url = '/'
str = '%s %s %s' % (method, url, self._http_vsn_str)
request = '%s %s %s' % (method, url, self._http_vsn_str)
self._output(str)
# Non-ASCII characters should have been eliminated earlier
self._output(request.encode('ascii'))
if self._http_vsn == 11:
# Issue some standard headers for better HTTP/1.1 compliance
@ -831,8 +832,8 @@ def putheader(self, header, value):
if self.__state != _CS_REQ_STARTED:
raise CannotSendHeader()
str = '%s: %s' % (header, value)
self._output(str)
header = '%s: %s' % (header, value)
self._output(header.encode('ascii'))
def endheaders(self):
"""Indicate that the last header line has been sent to the server."""
@ -846,7 +847,6 @@ def endheaders(self):
def request(self, method, url, body=None, headers={}):
"""Send a complete request to the server."""
try:
self._send_request(method, url, body, headers)
except socket.error as v:
@ -888,6 +888,7 @@ def _send_request(self, method, url, body, headers):
self.endheaders()
if body:
if isinstance(body, str): body = body.encode('ascii')
self.send(body)
def getresponse(self):