From 5e94f38001fdaccda924aab9e5f0ffc064492129 Mon Sep 17 00:00:00 2001 From: Viktor Haag Date: Fri, 24 May 2013 14:01:30 -0400 Subject: [PATCH] - fixed func call syntax on lower to lower() - added test cases for trying to test GETS on mixed-case schemas --- requests/adapters.py | 2 +- requests/sessions.py | 2 +- test_requests.py | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/requests/adapters.py b/requests/adapters.py index b45027965c..b4f5bf6c1d 100644 --- a/requests/adapters.py +++ b/requests/adapters.py @@ -118,7 +118,7 @@ def cert_verify(self, conn, url, verify, cert): :param verify: Whether we should actually verify the certificate. :param cert: The SSL certificate to verify. """ - if url.lower.startswith('https') and verify: + if url.lower().startswith('https') and verify: cert_loc = None diff --git a/requests/sessions.py b/requests/sessions.py index ccd76340d5..a55f84da88 100644 --- a/requests/sessions.py +++ b/requests/sessions.py @@ -467,7 +467,7 @@ def get_adapter(self, url): """Returns the appropriate connnection adapter for the given URL.""" for (prefix, adapter) in self.adapters.items(): - if url.lower.startswith(prefix): + if url.lower().startswith(prefix): return adapter # Nothing matches :-/ diff --git a/test_requests.py b/test_requests.py index 4a4831e5b2..3600600830 100755 --- a/test_requests.py +++ b/test_requests.py @@ -87,6 +87,27 @@ def test_params_are_added_before_fragment(self): self.assertEqual(request.url, "http://example.com/path?key=value&a=b#fragment") + def test_mixed_case_scheme_acceptable(self): + s = requests.Session() + r = requests.Request('GET', 'HTTP://httbin.org/get') + r = s.send(r.prepare()) + self.assertEqual(r.status_code,200) + r = requests.Request('GET', 'hTTp://httbin.org/get') + r = s.send(r.prepare()) + self.assertEqual(r.status_code,200) + r = requests.Request('GET', 'HttP://httbin.org/get') + r = s.send(r.prepare()) + self.assertEqual(r.status_code,200) + r = requests.Request('GET', 'HTTPS://httbin.org/get') + r = s.send(r.prepare()) + self.assertEqual(r.status_code,200) + r = requests.Request('GET', 'hTTps://httbin.org/get') + r = s.send(r.prepare()) + self.assertEqual(r.status_code,200) + r = requests.Request('GET', 'HttPs://httbin.org/get') + r = s.send(r.prepare()) + self.assertEqual(r.status_code,200) + def test_HTTP_200_OK_GET_ALTERNATIVE(self): r = requests.Request('GET', httpbin('get')) s = requests.Session()