Mercurial > cpython-lru_cache-weakref
diff Lib/http/client.py @ 63538:904ef4bbff5e 3.1
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
........
| author | Senthil Kumaran <orsenthil@gmail.com> |
|---|---|
| date | Mon, 02 Aug 2010 12:01:21 +0000 |
| parents | 7b59b1f633cb |
| children | bebe5e35661e |
line wrap: on
line diff
--- a/Lib/http/client.py Sun Aug 01 23:52:25 2010 +0000 +++ b/Lib/http/client.py Mon Aug 02 12:01:21 2010 +0000 @@ -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."""