Add support for setting timeouts, SSL certs verification and HTTPS proxies

Alex Schworer · Alex Schworer · commit ad167551f069 · 2013-06-20T18:01:00.000-07:00
diff --git a/test/test_zencoder.py b/test/test_zencoder.py
@@ -34,6 +34,27 @@ def test_set_api_edge_version(self):
         zc = Zencoder(api_version='edge')
         self.assertEquals(zc.base_url, 'https://app.zencoder.com/api/')
 
+    def test_set_timeout(self):
+        api_key = 'testapikey'
+        zc = Zencoder(api_key=api_key, timeout=999)
+
+        self.assertEquals(zc.job.requests_params['timeout'], 999)
+
+    def test_set_proxies(self):
+        api_key = 'testapikey'
+        proxies = {
+            'https': 'https://10.10.1.10:1080'
+        }
+        zc = Zencoder(api_key=api_key, proxies=proxies)
+
+        self.assertEquals(zc.job.requests_params['proxies'], proxies)
+
+    def test_set_verify_false(self):
+        api_key = 'testapikey'
+        zc = Zencoder(api_key=api_key, verify=False)
+
+        self.assertEquals(zc.job.requests_params['verify'], False)
+
 if __name__ == "__main__":
     unittest.main()
 
diff --git a/zencoder/core.py b/zencoder/core.py
@@ -39,8 +39,7 @@ def __init__(self,
                  test=False,
                  version=None,
                  proxies=None,
-                 cert=None,
-                 http_timeout=None):
+                 verify=True):
 
         self.base_url = base_url
 
@@ -49,10 +48,13 @@ def __init__(self,
 
         self.http = requests.Session()
 
-        # set requests additional settings. `None` is default for all of these settings
-        self.http.timeout = http_timeout
-        self.http.proxies = proxies
-        self.http.cert = cert
+        # set requests additional settings.
+        # `None` is default for all of these settings.
+        self.requests_params = {
+            'timeout': timeout,
+            'proxies': proxies,
+            'verify': verify
+        }
 
         self.api_key = api_key
         self.test = test
@@ -80,26 +82,38 @@ def delete(self, url, params=None):
 
             ``params`` should be a dictionary
         """
-        response = self.http.delete(url, params=params)
+        response = self.http.delete(url,
+                                    params=params,
+                                    **self.requests_params)
         return self.process(response)
 
     def get(self, url, data=None):
         """ Executes an HTTP GET request for the given URL.
 
             ``data`` should be a dictionary of url parameters
         """
-        response = self.http.get(url, headers=self.headers, params=data)
+        response = self.http.get(url,
+                                 headers=self.headers,
+                                 params=data,
+                                 **self.requests_params)
         return self.process(response)
 
     def post(self, url, body=None):
         """ Executes an HTTP POST request for the given URL. """
-        response = self.http.post(url, data=body, headers=self.headers)
+        response = self.http.post(url,
+                                  headers=self.headers,
+                                  data=body,
+                                  **self.requests_params)
 
         return self.process(response)
 
     def put(self, url, data=None, body=None):
         """ Executes an HTTP PUT request for the given URL. """
-        response = self.http.put(url, params=data, data=body, headers=self.headers)
+        response = self.http.put(url,
+                                 headers=self.headers,
+                                 data=body,
+                                 params=data,
+                                 **self.requests_params)
 
         return self.process(response)
 
@@ -135,8 +149,17 @@ class Zencoder(object):
 
     Set ``api_version='edge'`` to get the Zencoder development API.
     (defaults to 'v2')
+
+    ``timeout``, ``proxies`` and ``verify`` can be set to control the
+    underlying HTTP requests that are made.
     """
-    def __init__(self, api_key=None, api_version=None, timeout=None, test=False):
+    def __init__(self,
+                 api_key=None,
+                 api_version=None,
+                 timeout=None,
+                 test=False,
+                 proxies=None,
+                 verify=True):
         if not api_version:
             api_version = 'v2'
 
@@ -155,7 +178,13 @@ def __init__(self, api_key=None, api_version=None, timeout=None, test=False):
         self.test = test
 
         args = (self.base_url, self.api_key)
-        kwargs = dict(timeout=timeout, test=self.test, version=api_version)
+
+        kwargs = dict(timeout=timeout,
+                      test=self.test,
+                      version=api_version,
+                      proxies=proxies,
+                      verify=verify)
+
         self.job = Job(*args, **kwargs)
         self.account = Account(*args, **kwargs)
         self.output = Output(*args, **kwargs)
