From: ms4py <marc.schlaich@googlemail.com>
Date: Mon, 4 Mar 2013 08:20:47 +0000 (+0100)
Subject: Fix for new proxy API.
X-Git-Tag: v2.0~5^2~11^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=134699faf9c7cb2d8fcbe505d0385b68b7d7a819;p=services%2Fpython-requests.git

Fix for new proxy API.
---

diff --git a/requests/adapters.py b/requests/adapters.py
index e6cb50e..01cbaf4 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, ProxyManager
+from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
 from .packages.urllib3.response import HTTPResponse
 from .compat import urlparse, basestring, urldefrag, unquote
 from .utils import (DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers,
@@ -194,7 +194,7 @@ class HTTPAdapter(BaseAdapter):
 
         if proxy:
             except_on_missing_scheme(proxy)
-            conn = ProxyManager(self.poolmanager.connection_from_url(proxy))
+            conn = proxy_from_url(proxy).connection_from_url(url)
         else:
             conn = self.poolmanager.connection_from_url(url.lower())