From 97304567a785e4f2fafc394c5029c8411c7d5012 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 3 Oct 2010 18:25:01 +0000 Subject: [PATCH] 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 (Sun, 03 Oct 2010) | 3 lines Fix Issue10012 - httplib headers, which are (sometimes mistakenly) int are explicitly cast to str (bytes - in py3k). ........ --- Lib/http/client.py | 2 ++ Lib/test/test_httplib.py | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/Lib/http/client.py b/Lib/http/client.py index 9348870c3d..f273b03c6f 100644 --- a/Lib/http/client.py +++ b/Lib/http/client.py @@ -916,6 +916,8 @@ class HTTPConnection: for i, one_value in enumerate(values): if hasattr(one_value, 'encode'): values[i] = one_value.encode('ascii') + elif isinstance(one_value, int): + values[i] = str(one_value).encode('ascii') value = b'\r\n\t'.join(values) header = header + b': ' + value self._output(header) diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py index 831d5aeb7c..642f06367d 100644 --- a/Lib/test/test_httplib.py +++ b/Lib/test/test_httplib.py @@ -89,6 +89,15 @@ class HeaderTests(TestCase): conn.request('POST', '/', body, headers) self.assertEqual(conn._buffer.count[header.lower()], 1) + def test_putheader(self): + conn = client.HTTPConnection('example.com') + conn.sock = FakeSocket(None) + conn.putrequest('GET','/') + conn.putheader('Content-length', 42) + print(conn._buffer) + self.assertTrue(b'Content-length: 42' in conn._buffer) + + class BasicTest(TestCase): def test_status_lines(self): # Test HTTP status lines -- 2.40.0