Merged revisions 83521 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83521 | senthil.kumaran | 2010-08-02 16:34:58 +0530 (Mon, 02 Aug 2010) | 3 lines
Fix Issue8572 - httplib getheader() throws error instead of default
........
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 737ba15..3a44788 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -449,7 +449,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()