Merging the py3k-pep3137 branch back into the py3k branch.
No detailed change log; just check out the change log for the py3k-pep3137
branch. The most obvious changes:
- str8 renamed to bytes (PyString at the C level);
- bytes renamed to buffer (PyBytes at the C level);
- PyString and PyUnicode are no longer compatible.
I.e. we now have an immutable bytes type and a mutable bytes type.
The behavior of PyString was modified quite a bit, to make it more
bytes-like. Some changes are still on the to-do list.
diff --git a/Lib/httplib.py b/Lib/httplib.py
index e891883..dc8bd6b 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -827,6 +827,7 @@
if self.port == HTTP_PORT:
self.putheader('Host', host_enc)
else:
+ host_enc = host_enc.decode("ascii")
self.putheader('Host', "%s:%s" % (host_enc, self.port))
# note: we are assuming that clients will not attempt to set these
@@ -860,8 +861,12 @@
if self.__state != _CS_REQ_STARTED:
raise CannotSendHeader()
- header = '%s: %s' % (header, value)
- self._output(header.encode('ascii'))
+ if hasattr(header, 'encode'):
+ header = header.encode('ascii')
+ if hasattr(value, 'encode'):
+ value = value.encode('ascii')
+ header = header + b': ' + value
+ self._output(header)
def endheaders(self):
"""Indicate that the last header line has been sent to the server."""