163 proxyurl = urlparse.urlunsplit(( |
163 proxyurl = urlparse.urlunsplit(( |
164 proxyscheme, netlocunsplit(proxyhost, proxyport, |
164 proxyscheme, netlocunsplit(proxyhost, proxyport, |
165 proxyuser, proxypasswd or ''), |
165 proxyuser, proxypasswd or ''), |
166 proxypath, proxyquery, proxyfrag)) |
166 proxypath, proxyquery, proxyfrag)) |
167 handler = urllib2.ProxyHandler({scheme: proxyurl}) |
167 handler = urllib2.ProxyHandler({scheme: proxyurl}) |
168 ui.debug(_('proxying through http://%s:%s\n') % |
168 ui.debug(_('proxying through http://%s:%s\n') % |
169 (proxyhost, proxyport)) |
169 (proxyhost, proxyport)) |
170 |
170 |
171 # urllib2 takes proxy values from the environment and those |
171 # urllib2 takes proxy values from the environment and those |
172 # will take precedence if found, so drop them |
172 # will take precedence if found, so drop them |
173 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]: |
173 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]: |