mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Merged revisions 75334 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r75334 | senthil.kumaran | 2009-10-11 10:28:55 +0530 (Sun, 11 Oct 2009) | 9 lines Merged revisions 75333 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75333 | senthil.kumaran | 2009-10-11 07:30:07 +0530 (Sun, 11 Oct 2009) | 3 lines Fixed Issue6894, urllib2 doesn't respect "no_proxy" environment ........ ................
This commit is contained in:
parent
290e939f2e
commit
1130163dc1
3 changed files with 22 additions and 0 deletions
|
@ -657,6 +657,10 @@ class ProxyHandler(BaseHandler):
|
|||
proxy_type, user, password, hostport = _parse_proxy(proxy)
|
||||
if proxy_type is None:
|
||||
proxy_type = orig_type
|
||||
|
||||
if req.host and proxy_bypass(req.host):
|
||||
return None
|
||||
|
||||
if user and password:
|
||||
user_pass = '%s:%s' % (unquote(user),
|
||||
unquote(password))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue