Better cacerts handling

pboucher · pboucher · commit 89fb384f880d · 2013-02-22T11:28:05.000-05:00
- setup will not compress the .egg which prevented cacerts access
- new cacerts attribute in the Shotgun constructor
- git will now ignore (.gitignore) structures created by easy_install
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,9 @@
 
 # test related
 tests/config
-.coverage
+.coverage
+
+# setup related
+build
+dist
+shotgun_api3.egg-info
diff --git a/setup.py b/setup.py
@@ -28,4 +28,5 @@
     script_args=script_args,
     include_package_data=True,
     package_data={'': [ 'cacerts.txt']},
+    zip_safe=False,
 )
diff --git a/shotgun_api3/shotgun.py b/shotgun_api3/shotgun.py
@@ -213,7 +213,8 @@ def __init__(self,
                  convert_datetimes_to_utc=True,
                  http_proxy=None,
                  ensure_ascii=True,
-                 connect=True):
+                 connect=True,
+				 ca_certs=None):
         """Initialises a new instance of the Shotgun client.
 
         :param base_url: http or https url to the shotgun server.
@@ -234,13 +235,18 @@ def __init__(self,
         form [username:pass@]proxy.com[:8080]
 
         :param connect: If True, connect to the server. Only used for testing.
+		
+		:param ca_certs: The path to the SSL certificate file. Useful for users
+		who would like to package their application into an executable.
         """
+
         self.config = _Config()
         self.config.api_key = api_key
         self.config.script_name = script_name
         self.config.convert_datetimes_to_utc = convert_datetimes_to_utc
         self.config.no_ssl_validation = NO_SSL_VALIDATION
         self._connection = None
+        self.__ca_certs = ca_certs
 
         self.base_url = (base_url or "").lower()
         self.config.scheme, self.config.server, api_base, _, _ = \
@@ -1566,10 +1572,10 @@ def _get_connection(self):
             pi = ProxyInfo(socks.PROXY_TYPE_HTTP, self.config.proxy_server,
                  self.config.proxy_port, proxy_user=self.config.proxy_user,
                  proxy_pass=self.config.proxy_pass)
-            self._connection = Http(timeout=self.config.timeout_secs,
+            self._connection = Http(timeout=self.config.timeout_secs, ca_certs=self.__ca_certs,
                 proxy_info=pi, disable_ssl_certificate_validation=self.config.no_ssl_validation)
         else:
-            self._connection = Http(timeout=self.config.timeout_secs,
+            self._connection = Http(timeout=self.config.timeout_secs, ca_certs=self.__ca_certs,
                 disable_ssl_certificate_validation=self.config.no_ssl_validation)
 
         return self._connection
@@ -1802,4 +1808,4 @@ def _translate_filters_simple(sg_filter):
 
     return condition
 
-     
+     

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,5 @@`
`28`	`28`	`script_args=script_args,`
`29`	`29`	`include_package_data=True,`
`30`	`30`	`package_data={'': [ 'cacerts.txt']},`
	`31`	`+ zip_safe=False,`
`31`	`32`	`)`