Allows the Location header in a 302 redirect to be provided as location. Resolves issue 113.

j.s@google.com · j.s@google.com · commit 44bef5dd8fea · 2009-11-21T01:53:29.000Z
diff --git a/src/gdata/client.py b/src/gdata/client.py
@@ -281,7 +281,8 @@ def request(self, method=None, uri=None, auth_token=None,
     # exists since the redirects are only used in the calendar API.
     elif response.status == 302:
       if redirects_remaining > 0:
-        location = response.getheader('Location')
+        location = (response.getheader('Location')
+                    or response.getheader('location'))
         if location is not None:
           m = re.compile('[\?\&]gsessionid=(\w*)').search(location)
           if m is not None:
diff --git a/src/gdata/service.py b/src/gdata/service.py
@@ -1094,7 +1094,8 @@ def Get(self, uri, extra_headers=None, redirects_remaining=4,
       return feed
     elif server_response.status == 302:
       if redirects_remaining > 0:
-        location = server_response.getheader('Location')
+        location = (server_response.getheader('Location')
+                    or server_response.getheader('location'))
         if location is not None:
           m = re.compile('[\?\&]gsessionid=(\w*)').search(location)
           if m is not None:
@@ -1341,7 +1342,8 @@ def PostOrPut(self, verb, data, uri, extra_headers=None, url_params=None,
       return feed
     elif server_response.status == 302:
       if redirects_remaining > 0:
-        location = server_response.getheader('Location')
+        location = (server_response.getheader('Location')
+                    or server_response.getheader('location'))
         if location is not None:
           m = re.compile('[\?\&]gsessionid=(\w*)').search(location)
           if m is not None:
@@ -1438,7 +1440,8 @@ def Delete(self, uri, extra_headers=None, url_params=None,
       return True
     elif server_response.status == 302:
       if redirects_remaining > 0:
-        location = server_response.getheader('Location')
+        location = (server_response.getheader('Location')
+                    or server_response.getheader('location'))
         if location is not None:
           m = re.compile('[\?\&]gsessionid=(\w*)').search(location)
           if m is not None:
diff --git a/tests/gdata_tests/client_test.py b/tests/gdata_tests/client_test.py
@@ -255,6 +255,25 @@ def test_redirects(self):
     except gdata.client.RedirectError, err:
       self.assert_(str(err).startswith('Too many redirects from server'))
 
+  def test_lowercase_location(self):
+    client = gdata.client.GDClient()
+    client.http_client = atom.mock_http_core.MockHttpClient()
+    # Add the redirect response for the initial request.
+    first_request = atom.http_core.HttpRequest('http://example.com/1', 
+                                               'POST')
+    # In some environments, notably App Engine, the HTTP headers which come
+    # back from a server will be normalized to all lowercase.
+    client.http_client.add_response(first_request, 302, None, 
+        {'location': 'http://example.com/1?gsessionid=12'})
+    second_request = atom.http_core.HttpRequest(
+        'http://example.com/1?gsessionid=12', 'POST')
+    client.http_client.AddResponse(second_request, 200, 'OK', body='Done')
+
+    response = client.Request('POST', 'http://example.com/1')
+    self.assertEqual(response.status, 200)
+    self.assertEqual(response.reason, 'OK')
+    self.assertEqual(response.read(), 'Done')
+
   def test_exercise_exceptions(self):
     # TODO
     pass
