From 7bb0497336a18520bd87da2bd2fba809ae56ee1a Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Sun, 11 Oct 2009 04:58:55 +0000 Subject: 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 ........ --- Lib/urllib/request.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Lib/urllib/request.py') diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py index 6bc386ba84..67f62eb39f 100644 --- a/Lib/urllib/request.py +++ b/Lib/urllib/request.py @@ -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)) -- cgit v1.2.1