projects
/
services
/
python-requests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9549391
00b4ca3
)
Merge pull request #779 from Lukasa/develop
author
Kenneth Reitz
<me@kennethreitz.com>
Sun, 19 Aug 2012 00:40:53 +0000
(17:40 -0700)
committer
Kenneth Reitz
<me@kennethreitz.com>
Sun, 19 Aug 2012 00:40:53 +0000
(17:40 -0700)
Make sure proxy exclusions work properly.
1
2
requests/models.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
requests/models.py
index
9270f0e
,
b45e99c
..
cc8ab08
---
1
/
requests/models.py
---
2
/
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: