Merge "Enable usage of proxies defined in environment (http(s)_proxy)."

1 files changed, 8 insertions, 2 deletions

diff --git a/swiftclient/client.py b/swiftclient/client.py
index 0eef678..dc457c6 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -29,6 +29,7 @@ from httplib import HTTPException, HTTPConnection, HTTPSConnection
 from time import sleep, time
 
 from swiftclient.exceptions import ClientException, InvalidHeadersException
+from swiftclient.utils import get_environ_proxies
 
 try:
     from swiftclient.https_connection import HTTPSConnectionNoSSLComp
@@ -140,8 +141,13 @@ def http_connection(url, proxy=None, ssl_compression=True):
     """
     url = encode_utf8(url)
     parsed = urlparse(url)
-    proxy_parsed = urlparse(proxy) if proxy else None
-    host = proxy_parsed if proxy else parsed.netloc
+    if proxy:
+        proxy_parsed = urlparse(proxy)
+    else:
+        proxies = get_environ_proxies(parsed.netloc)
+        proxy = proxies.get(parsed.scheme, None)
+        proxy_parsed = urlparse(proxy) if proxy else None
+    host = proxy_parsed.netloc if proxy else parsed.netloc
     if parsed.scheme == 'http':
         conn = HTTPConnection(host)
     elif parsed.scheme == 'https':