summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-08-02 17:11:50 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-08-02 17:11:50 (GMT)
commitbdeff47680e827b5c534af94a0cc0744689b863c (patch)
tree502246baf5426417aae84c99267031d867067c1b
parent3357840bafd2b118d19d0319cd9183a11cb4cd6b (diff)
downloadcpython-bdeff47680e827b5c534af94a0cc0744689b863c.zip
cpython-bdeff47680e827b5c534af94a0cc0744689b863c.tar.gz
cpython-bdeff47680e827b5c534af94a0cc0744689b863c.tar.bz2
Merged revisions 83529 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r83529 | senthil.kumaran | 2010-08-02 22:39:02 +0530 (Mon, 02 Aug 2010) | 3 lines Rewording the getheader method of HTTPResponse. ........
-rw-r--r--Doc/library/http.client.rst7
1 files changed, 4 insertions, 3 deletions
diff --git a/Doc/library/http.client.rst b/Doc/library/http.client.rst
index 3a44788..fe65812 100644
--- a/Doc/library/http.client.rst
+++ b/Doc/library/http.client.rst
@@ -448,9 +448,10 @@ statement.
.. method:: HTTPResponse.getheader(name, default=None)
- Get the contents of the header *name*, or *default* if there is no matching
- 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.
+ Return the value of the header *name*, or *default* if there is no header
+ matching *name*. If there is more than one header with the name *name*,
+ return all of the values joined by ', '. If 'default' is any iterable other
+ than a single string, its elements are similarly returned joined by commas.
.. method:: HTTPResponse.getheaders()