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
........

1 files changed, 5 insertions, 1 deletions

diff --git a/Lib/http/client.py b/Lib/http/client.py
index 612fa37..d490b3d 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -602,7 +602,11 @@ class HTTPResponse(io.RawIOBase):
     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."""