[Python-checkins] r85207 - in python/branches/release27-maint: Lib/httplib.py Lib/test/test_httplib.py

Sun Oct 3 20:26:07 CEST 2010

Author: senthil.kumaran
Date: Sun Oct 3 20:26:07 2010
New Revision: 85207
Log:
Merged revisions 85205 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r85205 | senthil.kumaran | 2010年10月03日 23:52:42 +0530 (2010年10月03日) | 3 lines
 
 Fix Issue10012 - httplib headers, which are (sometimes mistakenly) int are explicitly cast to str (bytes - in py3k).
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/httplib.py
 python/branches/release27-maint/Lib/test/test_httplib.py
Modified: python/branches/release27-maint/Lib/httplib.py
==============================================================================

--- python/branches/release27-maint/Lib/httplib.py	(original)
+++ python/branches/release27-maint/Lib/httplib.py	Sun Oct 3 20:26:07 2010
@@ -915,7 +915,7 @@
 if self.__state != _CS_REQ_STARTED:
 raise CannotSendHeader()
 
- hdr = '%s: %s' % (header, '\r\n\t'.join(values))
+ hdr = '%s: %s' % (header, '\r\n\t'.join([str(v) for v in values]))
 self._output(hdr)
 
 def endheaders(self, message_body=None):
Modified: python/branches/release27-maint/Lib/test/test_httplib.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_httplib.py	(original)
+++ python/branches/release27-maint/Lib/test/test_httplib.py	Sun Oct 3 20:26:07 2010
@@ -1,3 +1,4 @@
+import httplib
 import array
 import httplib
 import StringIO
@@ -64,8 +65,6 @@
 # Some headers are added automatically, but should not be added by
 # .request() if they are explicitly set.
 
- import httplib
-
 class HeaderCountingBuffer(list):
 def __init__(self):
 self.count = {}
@@ -91,6 +90,13 @@
 conn.request('POST', '/', body, headers)
 self.assertEqual(conn._buffer.count[header.lower()], 1)
 
+ def test_putheader(self):
+ conn = httplib.HTTPConnection('example.com')
+ conn.sock = FakeSocket(None)
+ conn.putrequest('GET','/')
+ conn.putheader('Content-length',42)
+ self.assertTrue('Content-length: 42' in conn._buffer)
+
 class BasicTest(TestCase):
 def test_status_lines(self):
 # Test HTTP status lines
