Adds a get_headers function to be used in Python2.2 and 2.3 since httplib.HTTPResponse does not have getheaders in those versions of Python. Resolves issue 335.

j.s@google.com · j.s@google.com · commit 00db919adec3 · 2010-02-12T02:23:43.000Z
diff --git a/src/atom/http_core.py b/src/atom/http_core.py
@@ -50,6 +50,30 @@ class ProxyError(Error):
 MIME_BOUNDARY = 'END_OF_PART'
 
 
+def get_headers(http_response):
+  """Retrieves all HTTP headers from an HTTP response from the server.
+  
+  This method is provided for backwards compatibility for Python2.2 and 2.3.
+  The httplib.HTTPResponse object in 2.2 and 2.3 does not have a getheaders
+  method so this function will use getheaders if available, but if not it
+  will retrieve a few using getheader.
+  """
+  if hasattr(http_response, 'getheaders'):
+    return http_response.getheaders()
+  else:
+    headers = []
+    for header in (
+        'location', 'content-type', 'content-length', 'age', 'allow',
+        'cache-control', 'content-location', 'content-encoding', 'date',
+        'etag', 'expires', 'last-modified', 'pragma', 'server',
+        'set-cookie', 'transfer-encoding', 'vary', 'via', 'warning',
+        'www-authenticate', 'gdata-version'):
+      value = http_response.getheader(header, None)
+      if value is not None:
+        headers.append((header, value))
+    return headers
+
+
 class HttpRequest(object):
   """Contains all of the parameters for an HTTP 1.1 request.
 
@@ -377,7 +401,7 @@ def _dump_response(http_response):
   """
   output = 'HttpResponse\n  status: %s\n  reason: %s\n  headers:' % (
       http_response.status, http_response.reason)
-  headers = http_response.getheaders()
+  headers = get_headers(http_response)
   if isinstance(headers, dict):
     for header, value in headers.iteritems():
       output += '    %s: %s\n' % (header, value)
diff --git a/src/atom/mock_http_core.py b/src/atom/mock_http_core.py
@@ -86,7 +86,7 @@ def request(self, http_request):
       scrubbed_response = _scrub_response(response)
       self.add_response(request, scrubbed_response.status,
                         scrubbed_response.reason,
-                        dict(scrubbed_response.getheaders()),
+                        dict(atom.http_core.get_headers(scrubbed_response)),
                         scrubbed_response.read())
       # Return the recording which we just added.
       return self._recordings[-1][1]
diff --git a/src/gdata/client.py b/src/gdata/client.py
@@ -116,7 +116,7 @@ def error_from_response(message, http_response, error_class,
   error.status = http_response.status
   error.reason = http_response.reason
   error.body = body
-  error.headers = http_response.getheaders()
+  error.headers = atom.http_core.get_headers(http_response)
   return error
 
 
diff --git a/tests/gdata_tests/live_client_test.py b/tests/gdata_tests/live_client_test.py
@@ -62,6 +62,8 @@ def test_create_update_delete(self):
     http_request.add_body_part(str(blog_post), 'application/atom+xml')
 
     def entry_from_string_wrapper(response):
+      self.assert_(response.getheader('content-type') is not None)
+      self.assert_(response.getheader('gdata-version') is not None)
       return atom.EntryFromString(response.read())
 
     entry = self.client.request('POST', 
