added tests for mixed-case scheme URLs, changed adapters passing down URLs into urlli...

diff --git a/requests/adapters.py b/requests/adapters.py
index b4f5bf6c1d7e1d1487f74f98b3fb5a809c128fa6..7b4916ca10052eaef78bab22c91c7185355786e9 100644 (file)
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -190,13 +190,13 @@ class HTTPAdapter(BaseAdapter):
         :param proxies: (optional) A Requests-style dictionary of proxies used on this request.
         """
         proxies = proxies or {}
-        proxy = proxies.get(urlparse(url).scheme)
+        proxy = proxies.get(urlparse(url.lower()).scheme)
 
         if proxy:
-            proxy = prepend_scheme_if_needed(proxy, urlparse(url).scheme)
+            proxy = prepend_scheme_if_needed(proxy, urlparse(url.lower()).scheme)
             conn = ProxyManager(self.poolmanager.connection_from_url(proxy))
         else:
-            conn = self.poolmanager.connection_from_url(url)
+            conn = self.poolmanager.connection_from_url(url.lower())
 
         return conn
 

diff --git a/test_requests.py b/test_requests.py
index 36006008303d6a6dc1c60d3b87a691782ffe51f4..a346334080b6a42f21de9b5e4f3133f012c23918 100755 (executable)
--- a/test_requests.py
+++ b/test_requests.py
@@ -89,22 +89,29 @@ class RequestsTestCase(unittest.TestCase):
 
     def test_mixed_case_scheme_acceptable(self):
         s = requests.Session()
-        r = requests.Request('GET', 'HTTP://httbin.org/get')
+        r = requests.Request('GET', 'http://httpbin.org/get')
         r = s.send(r.prepare())
         self.assertEqual(r.status_code,200)
-        r = requests.Request('GET', 'hTTp://httbin.org/get')
+        s = requests.Session()
+        r = requests.Request('GET', 'HTTP://httpbin.org/get')
+        r = s.send(r.prepare())
+        self.assertEqual(r.status_code,200)
+        r = requests.Request('GET', 'hTTp://httpbin.org/get')
+        r = s.send(r.prepare())
+        self.assertEqual(r.status_code,200)
+        r = requests.Request('GET', 'HttP://httpbin.org/get')
         r = s.send(r.prepare())
         self.assertEqual(r.status_code,200)
-        r = requests.Request('GET', 'HttP://httbin.org/get')
+        r = requests.Request('GET', 'https://httpbin.org/get')
         r = s.send(r.prepare())
         self.assertEqual(r.status_code,200)
-        r = requests.Request('GET', 'HTTPS://httbin.org/get')
+        r = requests.Request('GET', 'HTTPS://httpbin.org/get')
         r = s.send(r.prepare())
         self.assertEqual(r.status_code,200)
-        r = requests.Request('GET', 'hTTps://httbin.org/get')
+        r = requests.Request('GET', 'hTTps://httpbin.org/get')
         r = s.send(r.prepare())
         self.assertEqual(r.status_code,200)
-        r = requests.Request('GET', 'HttPs://httbin.org/get')
+        r = requests.Request('GET', 'HttPs://httpbin.org/get')
         r = s.send(r.prepare())
         self.assertEqual(r.status_code,200)