From: Kenneth Reitz <me@kennethreitz.com>
Date: Sun, 19 Aug 2012 00:40:53 +0000 (-0700)
Subject: Merge pull request #779 from Lukasa/develop
X-Git-Tag: v0.13.7~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=489ce1c8a9fb16fb38a2073b738c7b01391e4ab8;p=services%2Fpython-requests.git

Merge pull request #779 from Lukasa/develop

Make sure proxy exclusions work properly.
---

489ce1c8a9fb16fb38a2073b738c7b01391e4ab8
diff --cc requests/models.py
index 9270f0e,b45e99c..cc8ab08
--- a/requests/models.py
+++ b/requests/models.py
@@@ -533,10 -553,10 +533,10 @@@ class Request(object)
              self.__dict__.update(r.__dict__)
  
          _p = urlparse(url)
 -        no_proxy = filter(lambda x:x.strip(), self.proxies.get('no', '').split(','))
 +        no_proxy = filter(lambda x: x.strip(), self.proxies.get('no', '').split(','))
          proxy = self.proxies.get(_p.scheme)
  
-         if proxy and not any(map(_p.netloc.endswith, no_proxy)):
+         if proxy and not any(map(_p.hostname.endswith, no_proxy)):
              conn = poolmanager.proxy_from_url(proxy)
              _proxy = urlparse(proxy)
              if '@' in _proxy.netloc: