summaryrefslogtreecommitdiffstats
path: root/Doc/library/http.client.rst
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-08-02 12:01:21 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-08-02 12:01:21 (GMT)
commit3357840bafd2b118d19d0319cd9183a11cb4cd6b (patch)
tree7262ae7b01a6fff1a522df55babdfd1dbba9035e /Doc/library/http.client.rst
parentfc499bcfd3c0d974ecbf9df2dd5017ed81bfae0b (diff)
downloadcpython-3357840bafd2b118d19d0319cd9183a11cb4cd6b.zip
cpython-3357840bafd2b118d19d0319cd9183a11cb4cd6b.tar.gz
cpython-3357840bafd2b118d19d0319cd9183a11cb4cd6b.tar.bz2
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 ........
Diffstat (limited to 'Doc/library/http.client.rst')
-rw-r--r--Doc/library/http.client.rst3
1 files changed, 2 insertions, 1 deletions
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 @@ statement.
.. 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()