feat: support http proxy in TwilioHttpClient

thehackercat · thehackercat · commit 19f3d50149ae · 2019-12-05T11:26:49.000+08:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "venv/bin/python2.7"
+}
diff --git a/tests/unit/http/test_http_client.py b/tests/unit/http/test_http_client.py
@@ -134,6 +134,15 @@ def test_last_response_empty_on_error(self):
             self.assertIsNotNone(self.client.last_request)
             self.assertIsNone(self.client.last_response)
 
+    def test_session_proxy(self):
+        proxies = {
+            'http': 'http://proxy.twilio.com',
+            'https': 'https://proxy.twilio.com',
+        }
+        self.client = TwilioHttpClient(proxy=proxies)
+        self.client.request('doesnt matter', 'doesnt matter')
+        self.assertEqual(self.client.proxy, self.session_mock.proxies)
+
 
 class TestHttpClientSession(unittest.TestCase):
 
diff --git a/twilio/http/http_client.py b/twilio/http/http_client.py
@@ -13,7 +13,7 @@ class TwilioHttpClient(HttpClient):
     """
     General purpose HTTP Client for interacting with the Twilio API
     """
-    def __init__(self, pool_connections=True, request_hooks=None, timeout=None, logger=_logger):
+    def __init__(self, pool_connections=True, request_hooks=None, timeout=None, logger=_logger, proxy=None):
         """
         Constructor for the TwilioHttpClient
 
@@ -22,6 +22,7 @@ def __init__(self, pool_connections=True, request_hooks=None, timeout=None, logg
         :param int timeout: Timeout for the requests.
                             Timeout should never be zero (0) or less.
         :param logger
+        :param dict proxy: Http proxy for the requests session
         """
         self.session = Session() if pool_connections else None
         self.last_request = None
@@ -32,6 +33,7 @@ def __init__(self, pool_connections=True, request_hooks=None, timeout=None, logg
         if timeout is not None and timeout <= 0:
             raise ValueError(timeout)
         self.timeout = timeout
+        self.proxy = proxy
 
     def request(self, method, url, params=None, data=None, headers=None, auth=None, timeout=None,
                 allow_redirects=False):
@@ -74,6 +76,8 @@ def request(self, method, url, params=None, data=None, headers=None, auth=None,
 
         self.last_response = None
         session = self.session or Session()
+        if self.proxy:
+            session.proxies = self.proxy
         request = Request(**kwargs)
         self.last_request = TwilioRequest(**kwargs)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "python.pythonPath": "venv/bin/python2.7"`
	`3`	`+}`