From: László Vaskó <vlacko@gmail.com>
Date: Fri, 18 Jan 2013 12:41:14 +0000 (+0100)
Subject: Fixed proxy requests to pool connections.
X-Git-Tag: v1.2.0~83^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=347a52aa5ced6ff3fec8723ccfb8531fdbcf8d9c;p=services%2Fpython-requests.git

Fixed proxy requests to pool connections.
---

diff --git a/requests/adapters.py b/requests/adapters.py
index 5f9d9c7..099a001 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -11,7 +11,7 @@ and maintain connections.
 import socket
 
 from .models import Response
-from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
+from .packages.urllib3.poolmanager import PoolManager, ProxyManager
 from .packages.urllib3.response import HTTPResponse
 from .hooks import dispatch_hook
 from .compat import urlparse, basestring, urldefrag
@@ -120,7 +120,7 @@ class HTTPAdapter(BaseAdapter):
 
         if proxy:
             proxy = prepend_scheme_if_needed(proxy, urlparse(url).scheme)
-            conn = proxy_from_url(proxy)
+            conn = ProxyManager(self.poolmanager.connection_from_url(proxy))
         else:
             conn = self.poolmanager.connection_from_url(url)