[Python-checkins] r83521 - in python/branches/py3k: Doc/library/http.client.rst Lib/http/client.py Lib/test/test_httplib.py
senthil.kumaran
python-checkins at python.org
Mon Aug 2 13:04:58 CEST 2010
Author: senthil.kumaran
Date: Mon Aug 2 13:04:58 2010
New Revision: 83521
Log:
Fix Issue8572 - httplib getheader() throws error instead of default
Modified:
python/branches/py3k/Doc/library/http.client.rst
python/branches/py3k/Lib/http/client.py
python/branches/py3k/Lib/test/test_httplib.py
Modified: python/branches/py3k/Doc/library/http.client.rst
==============================================================================
--- python/branches/py3k/Doc/library/http.client.rst (original)
+++ python/branches/py3k/Doc/library/http.client.rst Mon Aug 2 13:04:58 2010
@@ -466,7 +466,8 @@
.. method:: HTTPResponse.getheader(name, default=None)
Get the contents of the header *name*, or *default* if there is no matching
- header.
+ header. If *default* is an iterator other than a string, then the return
+ value will be a string consisting of items of the iterator joined by comma.
.. method:: HTTPResponse.getheaders()
Modified: python/branches/py3k/Lib/http/client.py
==============================================================================
--- python/branches/py3k/Lib/http/client.py (original)
+++ python/branches/py3k/Lib/http/client.py Mon Aug 2 13:04:58 2010
@@ -602,7 +602,11 @@
def getheader(self, name, default=None):
if self.headers is None:
raise ResponseNotReady()
- return ', '.join(self.headers.get_all(name, default))
+ headers = self.headers.get_all(name) or default
+ if isinstance(headers, str) or not hasattr(headers, '__iter__'):
+ return headers
+ else:
+ return ', '.join(headers)
def getheaders(self):
"""Return list of (header, value) tuples."""
Modified: python/branches/py3k/Lib/test/test_httplib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_httplib.py (original)
+++ python/branches/py3k/Lib/test/test_httplib.py Mon Aug 2 13:04:58 2010
@@ -442,9 +442,46 @@
self.assertEqual("5", message.get("content-length"))
self.assertEqual(b'body\xc1', f.read())
+
+class HTTPResponseTest(TestCase):
+
+ def setUp(self):
+ body = "HTTP/1.1 200 Ok\r\nMy-Header: first-value\r\nMy-Header: \
+ second-value\r\n\r\nText"
+ sock = FakeSocket(body)
+ self.resp = client.HTTPResponse(sock)
+ self.resp.begin()
+
+ def test_getting_header(self):
+ header = self.resp.getheader('My-Header')
+ self.assertEqual(header, 'first-value, second-value')
+
+ header = self.resp.getheader('My-Header', 'some default')
+ self.assertEqual(header, 'first-value, second-value')
+
+ def test_getting_nonexistent_header_with_string_default(self):
+ header = self.resp.getheader('No-Such-Header', 'default-value')
+ self.assertEqual(header, 'default-value')
+
+ def test_getting_nonexistent_header_with_iterable_default(self):
+ header = self.resp.getheader('No-Such-Header', ['default', 'values'])
+ self.assertEqual(header, 'default, values')
+
+ header = self.resp.getheader('No-Such-Header', ('default', 'values'))
+ self.assertEqual(header, 'default, values')
+
+ def test_getting_nonexistent_header_without_default(self):
+ header = self.resp.getheader('No-Such-Header')
+ self.assertEqual(header, None)
+
+ def test_getting_header_defaultint(self):
+ header = self.resp.getheader('No-Such-Header',default=42)
+ self.assertEqual(header, 42)
+
def test_main(verbose=None):
support.run_unittest(HeaderTests, OfflineTest, BasicTest, TimeoutTest,
- HTTPSTimeoutTest, RequestBodyTest, SourceAddressTest)
+ HTTPSTimeoutTest, RequestBodyTest, SourceAddressTest,
+ HTTPResponseTest)
if __name__ == '__main__':
test_main()
More information about the Python-checkins
mailing list