From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 17 Dec 2012 18:58:07 +0000 (-0500)
Subject: v1.0.2
X-Git-Tag: v1.0.2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5eb3a17b55992163e5958fc30775194d96b8f7ed;p=services%2Fpython-requests.git

v1.0.2
---

diff --git a/HISTORY.rst b/HISTORY.rst
index e979f67..6d867e1 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,11 @@
 History
 -------
 
+1.0.2 (2012-12-17)
+++++++++++++++++++
+
+- Proxy fix for HTTPAdapter.
+
 1.0.1 (2012-12-17)
 ++++++++++++++++++
 
diff --git a/requests/adapters.py b/requests/adapters.py
index 04995df..dc18dee 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -13,7 +13,7 @@ import socket
 
 from .models import Response
 from .auth import HTTPProxyAuth
-from .packages.urllib3.poolmanager import PoolManager, ProxyManager
+from .packages.urllib3.poolmanager import PoolManager, proxy_from_url
 from .hooks import dispatch_hook
 from .compat import urlparse
 from .utils import DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers
@@ -119,7 +119,7 @@ class HTTPAdapter(BaseAdapter):
         proxy = proxies.get(urlparse(url).scheme)
 
         if proxy:
-            conn = ProxyManager(self.poolmanager.proxy_from_url(proxy))
+            conn = proxy_from_url(proxy)
         else:
             conn = self.poolmanager.connection_from_url(url)