Get proxy info from http_proxy first, HTTP_PROXY second

This commit is contained in:
Brian Eugley
2015-04-15 15:23:17 -04:00
parent 7c79c1b80b
commit f035591d70
+4 -6
View File
@@ -326,12 +326,10 @@ class Requester:
## set.
## http_proxy: http://user:password@proxy_host:proxy_port
##
try:
proxy_uri = os.getenv('http_proxy')
except:
proxy_uri = None
if (proxy_uri != None):
proxy_uri = os.getenv('http_proxy')
if proxy_uri is None:
proxy_uri = os.getenv('HTTP_PROXY')
if proxy_uri is not None:
url = urlparse.urlparse(proxy_uri)
conn = self.__connectionClass(url.hostname, url.port, **kwds)
headers = {}