Merge pull request #142 from plotly/set-certificate

Set certificate

Author: theengineear

plotly/plotly/plotly.py

@@ -67,6 +67,7 @@ def sign_in(username, api_key, **kwargs):
     _config['plotly_domain'] = kwargs.get('plotly_domain')
     _config['plotly_streaming_domain'] = kwargs.get('plotly_streaming_domain')
     _config['plotly_api_domain'] = kwargs.get('plotly_api_domain')
+    _config['plotly_ssl_verification'] = kwargs.get('plotly_ssl_verification')
     # TODO: verify format of config options
 
 
@@ -141,7 +142,7 @@ def get_config():
     """Returns either module config or file config."""
     config = tools.get_config_file()
     for config_key in config:
-        if _config.get(config_key):
+        if _config.get(config_key) is not None:
             config[config_key] = _config[config_key]
     return config
 
@@ -359,7 +360,9 @@ def get_figure(file_owner_or_url, file_id=None, raw=False):
         raise exceptions.PlotlyError(
             "The 'file_id' argument must be a non-negative number."
         )
-    response = requests.get(plotly_rest_url + resource, headers=headers)
+    response = requests.get(plotly_rest_url + resource,
+                            headers=headers,
+                            verify=get_config()['plotly_ssl_verification'])
     if response.status_code == 200:
         if six.PY3:
             content = json.loads(response.content.decode('unicode_escape'))
@@ -579,10 +582,10 @@ def get(figure_or_data, format='png', width=None, height=None):
             payload['height'] = height
 
         url = get_config()['plotly_domain'] + "/apigenimage/"
-        res = requests.post(url,
-                            data=json.dumps(payload,
-                                            cls=utils._plotlyJSONEncoder),
-                            headers=headers)
+        res = requests.post(
+            url, data=json.dumps(payload, cls=utils._plotlyJSONEncoder),
+            headers=headers, verify=get_config()['plotly_ssl_verification']
+        )
 
         headers = res.headers
 
@@ -682,7 +685,8 @@ def mkdirs(cls, folder_path):
 
         url = _api_v2.api_url('folders')
 
-        res = requests.post(url, data=payload, headers=_api_v2.headers())
+        res = requests.post(url, data=payload, headers=_api_v2.headers(),
+                            verify=get_config()['plotly_ssl_verification'])
 
         _api_v2.response_handler(res)
 
@@ -733,7 +737,8 @@ def upload(cls, grid, filename,
 
         upload_url = _api_v2.api_url('grids')
         req = requests.post(upload_url, data=payload,
-                            headers=_api_v2.headers())
+                            headers=_api_v2.headers(),
+                            verify=get_config()['plotly_ssl_verification'])
 
         res = _api_v2.response_handler(req)
 
@@ -775,7 +780,8 @@ def append_columns(cls, columns, grid=None, grid_url=None):
         }
 
         api_url = _api_v2.api_url('grids')+'/{grid_id}/col'.format(grid_id=grid_id)
-        res = requests.post(api_url, data=payload, headers=_api_v2.headers())
+        res = requests.post(api_url, data=payload, headers=_api_v2.headers(),
+                            verify=get_config()['plotly_ssl_verification'])
         res = _api_v2.response_handler(res)
 
         cls._fill_in_response_column_ids(columns, res['cols'], grid_id)
@@ -807,7 +813,8 @@ def append_rows(cls, rows, grid=None, grid_url=None):
 
         api_url = (_api_v2.api_url('grids')+
                    '/{grid_id}/row'.format(grid_id=grid_id))
-        res = requests.post(api_url, data=payload, headers=_api_v2.headers())
+        res = requests.post(api_url, data=payload, headers=_api_v2.headers(),
+                            verify=get_config()['plotly_ssl_verification'])
         _api_v2.response_handler(res)
 
         if grid:
@@ -826,7 +833,8 @@ def append_rows(cls, rows, grid=None, grid_url=None):
     def delete(cls, grid=None, grid_url=None):
         grid_id = _api_v2.parse_grid_id_args(grid, grid_url)
         api_url = _api_v2.api_url('grids')+'/'+grid_id
-        res = requests.delete(api_url, headers=_api_v2.headers())
+        res = requests.delete(api_url, headers=_api_v2.headers(),
+                              verify=get_config()['plotly_ssl_verification'])
         _api_v2.response_handler(res)
 
 
@@ -844,7 +852,8 @@ def upload(cls, meta, grid=None, grid_url=None):
 
         api_url = _api_v2.api_url('grids')+'/{grid_id}'.format(grid_id=grid_id)
 
-        res = requests.patch(api_url, data=payload, headers=_api_v2.headers())
+        res = requests.patch(api_url, data=payload, headers=_api_v2.headers(),
+                             verify=get_config()['plotly_ssl_verification'])
 
         return _api_v2.response_handler(res)
 
@@ -963,7 +972,8 @@ def _send_to_plotly(figure, **plot_options):
 
     url = get_config()['plotly_domain'] + "/clientresp"
 
-    r = requests.post(url, data=payload)
+    r = requests.post(url, data=payload,
+                      verify=get_config()['plotly_ssl_verification'])
     r.raise_for_status()
     r = json.loads(r.text)
     if 'error' in r and r['error'] != '':

plotly/tests/test_core/test_plotly/test_credentials.py

@@ -51,14 +51,19 @@ def test_sign_in_with_config(self):
         api_key = 'place holder'
         plotly_domain = 'test domain'
         plotly_streaming_domain = 'test streaming domain'
+        plotly_ssl_verification = False
         py.sign_in(
             username,
             api_key,
             plotly_domain=plotly_domain,
-            plotly_streaming_domain=plotly_streaming_domain
+            plotly_streaming_domain=plotly_streaming_domain,
+            plotly_ssl_verification=plotly_ssl_verification
         )
         config = py.get_config()
         self.assertEqual(config['plotly_domain'], plotly_domain)
         self.assertEqual(
             config['plotly_streaming_domain'], plotly_streaming_domain
         )
+        self.assertEqual(
+            config['plotly_ssl_verification'], plotly_ssl_verification
+        )

plotly/tools.py

@@ -50,7 +50,8 @@ def warning_on_one_line(message, category, filename, lineno, file=None, line=Non
                                     'stream_ids': []},
                  CONFIG_FILE: {'plotly_domain': 'https://plot.ly',
                                'plotly_streaming_domain': 'stream.plot.ly',
-                               'plotly_api_domain': 'https://api.plot.ly'}}
+                               'plotly_api_domain': 'https://api.plot.ly',
+                               'plotly_ssl_verification': True}}
 
 try:
     os.mkdir(TEST_DIR)
@@ -142,7 +143,8 @@ def reset_credentials_file():
 
 def set_config_file(plotly_domain=None,
                     plotly_streaming_domain=None,
-                    plotly_api_domain=None):
+                    plotly_api_domain=None,
+                    plotly_ssl_verification=None):
     """Set the keyword-value pairs in `~/.plotly/.config`.
 
     """
@@ -157,6 +159,8 @@ def set_config_file(plotly_domain=None,
         settings['plotly_streaming_domain'] = plotly_streaming_domain
     if isinstance(plotly_api_domain, six.string_types):
         settings['plotly_api_domain'] = plotly_api_domain
+    if isinstance(plotly_ssl_verification, (six.string_types, bool)):
+        settings['plotly_ssl_verification'] = plotly_ssl_verification
     utils.save_json_dict(CONFIG_FILE, settings)
     ensure_local_plotly_files()  # make sure what we just put there is OK
 

plotly/version.py

@@ -1 +1 @@
-__version__ = '1.4.2'
+__version__ = '1.4.3'