Use http_requests instead of requests

Author: Felix Kerekes

plotly/graph_reference.py

@@ -10,7 +10,7 @@
 import re
 from pkg_resources import resource_string
 
-import requests
+import http_requests
 import six
 
 from plotly import files, utils
@@ -89,10 +89,10 @@ def get_graph_reference():
                                                 GRAPH_REFERENCE_PATH, sha1)
 
     try:
-        response = requests.get(graph_reference_url,
+        response = http_requests.get(graph_reference_url,
                                 timeout=GRAPH_REFERENCE_DOWNLOAD_TIMEOUT)
         response.raise_for_status()
-    except requests.exceptions.RequestException:
+    except http_requests.exceptions.RequestException:
         if not graph_reference:
             path = os.path.join('graph_reference', 'default-schema.json')
             s = resource_string('plotly', path).decode('utf-8')

plotly/plotly/plotly.py

@@ -22,11 +22,11 @@
 import os
 import warnings
 
-import requests
+import http_requests
 import six
 import six.moves
 
-from requests.auth import HTTPBasicAuth
+from http_requests.auth import HTTPBasicAuth
 
 from plotly import exceptions, tools, utils, version, files
 from plotly.plotly import chunked_requests
@@ -384,7 +384,7 @@ 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,
+    response = http_requests.get(plotly_rest_url + resource,
                             headers=headers,
                             verify=get_config()['plotly_ssl_verification'])
     if response.status_code == 200:
@@ -678,7 +678,7 @@ def get(figure_or_data, format='png', width=None, height=None, scale=None):
             payload['scale'] = scale
         url = _api_v2.api_url('images/')
 
-        res = requests.post(
+        res = http_requests.post(
             url, data=json.dumps(payload, cls=utils.PlotlyJSONEncoder),
             headers=headers, verify=get_config()['plotly_ssl_verification'],
         )
@@ -831,7 +831,7 @@ def mkdirs(cls, folder_path):
 
         url = _api_v2.api_url('folders')
 
-        res = requests.post(url, data=payload, headers=_api_v2.headers(),
+        res = http_requests.post(url, data=payload, headers=_api_v2.headers(),
                             verify=get_config()['plotly_ssl_verification'])
 
         _api_v2.response_handler(res)
@@ -953,7 +953,7 @@ def upload(cls, grid, filename,
             payload['parent_path'] = parent_path
 
         upload_url = _api_v2.api_url('grids')
-        req = requests.post(upload_url, data=payload,
+        req = http_requests.post(upload_url, data=payload,
                             headers=_api_v2.headers(),
                             verify=get_config()['plotly_ssl_verification'])
 
@@ -1032,7 +1032,7 @@ 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 = http_requests.post(api_url, data=payload, headers=_api_v2.headers(),
                             verify=get_config()['plotly_ssl_verification'])
         res = _api_v2.response_handler(res)
 
@@ -1108,7 +1108,7 @@ 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 = http_requests.post(api_url, data=payload, headers=_api_v2.headers(),
                             verify=get_config()['plotly_ssl_verification'])
         _api_v2.response_handler(res)
 
@@ -1160,7 +1160,7 @@ 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 = http_requests.delete(api_url, headers=_api_v2.headers(),
                               verify=get_config()['plotly_ssl_verification'])
         _api_v2.response_handler(res)
 
@@ -1228,7 +1228,7 @@ 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 = http_requests.patch(api_url, data=payload, headers=_api_v2.headers(),
                              verify=get_config()['plotly_ssl_verification'])
 
         return _api_v2.response_handler(res)
@@ -1284,7 +1284,7 @@ def parse_grid_id_args(cls, grid, grid_url):
     def response_handler(cls, response):
         try:
             response.raise_for_status()
-        except requests.exceptions.HTTPError as requests_exception:
+        except http_requests.exceptions.HTTPError as requests_exception:
             if (response.status_code == 404 and
                     get_config()['plotly_api_domain']
                     != tools.get_config_defaults()['plotly_api_domain']):
@@ -1362,7 +1362,7 @@ def add_share_key_to_url(plot_url, attempt=0):
     file_id = urlsplit.path.split('/')[2]
 
     url = _api_v2.api_url("files/") + file_owner + ":" + file_id
-    new_response = requests.patch(url,
+    new_response = http_requests.patch(url,
                                   headers=_api_v2.headers(),
                                   data={"share_key_enabled":
                                         "True",
@@ -1382,7 +1382,7 @@ def add_share_key_to_url(plot_url, attempt=0):
     # check for access, and retry a couple of times if this is the case
     # https://github.com/plotly/streambed/issues/4089
     embed_url = plot_url.split('?')[0] + '.embed' + plot_url.split('?')[1]
-    access_res = requests.get(embed_url)
+    access_res = http_requests.get(embed_url)
     if access_res.status_code == 404:
         attempt += 1
         if attempt == 5:
@@ -1422,7 +1422,7 @@ def _send_to_plotly(figure, **plot_options):
 
     url = get_config()['plotly_domain'] + "/clientresp"
 
-    r = requests.post(url, data=payload,
+    r = http_requests.post(url, data=payload,
                       verify=get_config()['plotly_ssl_verification'])
     r.raise_for_status()
     r = json.loads(r.text)

plotly/tests/test_core/test_file/test_file.py

@@ -7,7 +7,7 @@
 """
 import random
 import string
-import requests
+import http_requests
 from unittest import TestCase
 
 from nose.plugins.attrib import attr
@@ -49,7 +49,7 @@ def test_duplicate_folders(self):
         py.file_ops.mkdirs(first_folder)
         try:
             py.file_ops.mkdirs(first_folder)
-        except requests.exceptions.RequestException as e:
+        except http_requests.exceptions.RequestException as e:
             self.assertTrue(400 <= e.response.status_code < 500)
         else:
             self.fail('Expected this to fail!')

plotly/tests/test_core/test_get_requests/test_get_requests.py

@@ -7,7 +7,7 @@
 """
 import copy
 import json
-import requests
+import http_requests
 
 import six
 from nose.plugins.attrib import attr
@@ -35,7 +35,7 @@ def test_user_does_not_exist():
     hd['plotly-username'] = username
     hd['plotly-apikey'] = api_key
     resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
-    response = requests.get(server + resource, headers=hd)
+    response = http_requests.get(server + resource, headers=hd)
     if six.PY3:
         content = json.loads(response.content.decode('unicode_escape'))
     else:
@@ -58,7 +58,7 @@ def test_file_does_not_exist():
     hd['plotly-username'] = username
     hd['plotly-apikey'] = api_key
     resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
-    response = requests.get(server + resource, headers=hd)
+    response = http_requests.get(server + resource, headers=hd)
     if six.PY3:
         content = json.loads(response.content.decode('unicode_escape'))
     else:
@@ -80,7 +80,7 @@ def test_wrong_api_key():  # TODO: does this test the right thing?
     hd['plotly-username'] = username
     hd['plotly-apikey'] = api_key
     resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
-    response = requests.get(server + resource, headers=hd)
+    response = http_requests.get(server + resource, headers=hd)
     assert response.status_code == 401
     # TODO: check error message?
 
@@ -98,7 +98,7 @@ def test_private_permission_defined():
     hd['plotly-username'] = username
     hd['plotly-apikey'] = api_key
     resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
-    response = requests.get(server + resource, headers=hd)
+    response = http_requests.get(server + resource, headers=hd)
     if six.PY3:
         content = json.loads(response.content.decode('unicode_escape'))
     else:
@@ -120,7 +120,7 @@ def test_missing_headers():
     for header in headers:
         hd = copy.copy(default_headers)
         del hd[header]
-        response = requests.get(server + resource, headers=hd)
+        response = http_requests.get(server + resource, headers=hd)
         if six.PY3:
             content = json.loads(response.content.decode('unicode_escape'))
         else:
@@ -140,7 +140,7 @@ def test_valid_request():
     hd['plotly-username'] = username
     hd['plotly-apikey'] = api_key
     resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
-    response = requests.get(server + resource, headers=hd)
+    response = http_requests.get(server + resource, headers=hd)
     if six.PY3:
         content = json.loads(response.content.decode('unicode_escape'))
     else:

plotly/tests/test_core/test_graph_reference/test_graph_reference.py

@@ -9,7 +9,7 @@
 from pkg_resources import resource_string
 from unittest import TestCase
 
-import requests
+import http_requests
 import six
 from nose.plugins.attrib import attr
 
@@ -64,7 +64,7 @@ def test_default_schema_is_up_to_date(self):
         api_domain = files.FILE_CONTENT[files.CONFIG_FILE]['plotly_api_domain']
         graph_reference_url = '{}{}?sha1'.format(api_domain,
                                                  gr.GRAPH_REFERENCE_PATH)
-        response = requests.get(graph_reference_url)
+        response = http_requests.get(graph_reference_url)
         if six.PY3:
             content = str(response.content, encoding='utf-8')
         else:

plotly/tests/test_core/test_grid/test_grid.py

@@ -9,7 +9,7 @@
 
 import random
 import string
-import requests
+import http_requests
 
 from nose import with_setup
 from nose.plugins.attrib import attr

plotly/tests/test_core/test_plotly/test_plot.py

@@ -8,7 +8,7 @@
 from __future__ import absolute_import
 
 import json
-import requests
+import http_requests
 import six
 
 from unittest import TestCase
@@ -184,7 +184,7 @@ def test_plot_url_response_given_sharing_key(self):
         # shareplot basically always gives a 200 if even if permission denied
         # embedplot returns an actual 404
         embed_url = plot_url.split('?')[0] + '.embed?' + plot_url.split('?')[1]
-        response = requests.get(embed_url)
+        response = http_requests.get(embed_url)
 
         self.assertEqual(response.status_code, 200)
 
@@ -201,7 +201,7 @@ def test_private_plot_response_with_and_without_share_key(self):
 
         private_plot_url = py._send_to_plotly(self.simple_figure,
                                               **kwargs)['url']
-        private_plot_response = requests.get(private_plot_url + ".json")
+        private_plot_response = http_requests.get(private_plot_url + ".json")
 
         # The json file of the private plot should be 404
         self.assertEqual(private_plot_response.status_code, 404)
@@ -210,7 +210,7 @@ def test_private_plot_response_with_and_without_share_key(self):
         urlsplit = six.moves.urllib.parse.urlparse(secret_plot_url)
         secret_plot_json_file = six.moves.urllib.parse.urljoin(
             urlsplit.geturl(), "?.json" + urlsplit.query)
-        secret_plot_response = requests.get(secret_plot_json_file)
+        secret_plot_response = http_requests.get(secret_plot_json_file)
 
         # The json file of the secret plot should be 200
         self.assertTrue(secret_plot_response.status_code, 200)