Mercurial > hg

comparison mercurial/url.py @ 15081:d30ec2d16c5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Sat, 10 Sep 2011 17:56:42 -0500
parents 1e45b92f4fb2 02734d2baa79
children 525fdb738975
comparison
equal deleted inserted replaced
15080:574dc5d74f9b 15081:d30ec2d16c5a
91 (proxy.host, proxy.port)) 91 (proxy.host, proxy.port))
92 else: 92 else:
93 proxies = {} 93 proxies = {}
94 94
95 # urllib2 takes proxy values from the environment and those 95 # urllib2 takes proxy values from the environment and those
96 # will take precedence if found, so drop them 96 # will take precedence if found. So, if there's a config entry
97 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]: 97 # defining a proxy, drop the environment ones
98 try: 98 if ui.config("http_proxy", "host"):
99 if env in os.environ: 99 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
100 del os.environ[env] 100 try:
101 except OSError: 101 if env in os.environ:
102 pass 102 del os.environ[env]
103 except OSError:
104 pass
103 105
104 urllib2.ProxyHandler.__init__(self, proxies) 106 urllib2.ProxyHandler.__init__(self, proxies)
105 self.ui = ui 107 self.ui = ui
106 108
107 def proxy_open(self, req, proxy, type_): 109 def proxy_open(self, req, proxy, type_):