--- a/mercurial/url.py Thu Dec 22 23:28:35 2016 -0700
+++ b/mercurial/url.py Sat Dec 24 01:16:14 2016 +0530
@@ -15,7 +15,6 @@
from .i18n import _
from . import (
- encoding,
error,
httpconnection as httpconnectionmod,
keepalive,
@@ -113,17 +112,6 @@
else:
proxies = {}
- # urllib2 takes proxy values from the environment and those
- # will take precedence if found. So, if there's a config entry
- # defining a proxy, drop the environment ones
- if ui.config("http_proxy", "host"):
- for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
- try:
- if env in encoding.environ:
- del encoding.environ[env]
- except OSError:
- pass
-
urlreq.proxyhandler.__init__(self, proxies)
self.ui = ui