change module naming, fix test

Nasdaq · runawaycoast · Mar 30, 2022 · Apr 1, 2022 · Apr 5, 2022 · Apr 5, 2022
commit a715192f6d8ff58e7c15948061c33d34dcd55cad
diff --git a/nasdaqdatalink/model/database.py b/nasdaqdatalink/model/database.py
@@ -4,7 +4,7 @@
 
 import nasdaqdatalink.model.dataset
 from nasdaqdatalink.api_config import ApiConfig
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 from nasdaqdatalink.errors.data_link_error import DataLinkError
 from nasdaqdatalink.message import Message
 from nasdaqdatalink.operations.get import GetOperation
@@ -43,7 +43,7 @@ def bulk_download_to_file(self, file_or_folder_path, **options):
         path_url = self._bulk_download_path()
 
         options['stream'] = True
-        r = Connection.request('get', path_url, **options)
+        r = connection.request('get', path_url, **options)
         file_path = file_or_folder_path
         if os.path.isdir(file_or_folder_path):
             file_path = file_or_folder_path + '/' + os.path.basename(urlparse(r.url).path)

diff --git a/nasdaqdatalink/model/datatable.py b/nasdaqdatalink/model/datatable.py
@@ -3,7 +3,7 @@
 
 from six.moves.urllib.request import urlopen
 
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 from nasdaqdatalink.errors.data_link_error import DataLinkError
 from nasdaqdatalink.message import Message
 from nasdaqdatalink.operations.get import GetOperation
@@ -51,7 +51,7 @@ def _request_file_info(self, file_or_folder_path, **options):
 
         updated_options = Util.convert_options(request_type=request_type, **options)
 
-        r = Connection.request(request_type, url, **updated_options)
+        r = connection.request(request_type, url, **updated_options)
 
         response_data = r.json()
 

diff --git a/nasdaqdatalink/operations/get.py b/nasdaqdatalink/operations/get.py
@@ -1,7 +1,7 @@
 from inflection import singularize
 
 from .operation import Operation
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 from nasdaqdatalink.util import Util
 
 
@@ -21,7 +21,7 @@ def __get_raw_data__(self):
 
         path = Util.constructed_path(cls.get_path(), options['params'])
 
-        r = Connection.request('get', path, **options)
+        r = connection.request('get', path, **options)
         response_data = r.json()
         Util.convert_to_dates(response_data)
         self._raw_data = response_data[singularize(cls.lookup_key())]

diff --git a/nasdaqdatalink/operations/list.py b/nasdaqdatalink/operations/list.py
@@ -1,5 +1,5 @@
 from .operation import Operation
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 from nasdaqdatalink.util import Util
 from nasdaqdatalink.model.paginated_list import PaginatedList
 from nasdaqdatalink.utils.request_type_util import RequestType
@@ -12,7 +12,7 @@ def all(cls, **options):
         if 'params' not in options:
             options['params'] = {}
         path = Util.constructed_path(cls.list_path(), options['params'])
-        r = Connection.request('get', path, **options)
+        r = connection.request('get', path, **options)
         response_data = r.json()
         Util.convert_to_dates(response_data)
         resource = cls.create_list_from_response(response_data)
@@ -27,7 +27,7 @@ def page(cls, datatable, **options):
 
         updated_options = Util.convert_options(request_type=request_type, **options)
 
-        r = Connection.request(request_type, path, **updated_options)
+        r = connection.request(request_type, path, **updated_options)
 
         response_data = r.json()
         Util.convert_to_dates(response_data)

diff --git a/test/test_connection.py b/test/test_connection.py
@@ -1,4 +1,4 @@
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 from nasdaqdatalink.api_config import ApiConfig
 from nasdaqdatalink.errors.data_link_error import (
     DataLinkError, LimitExceededError, InternalServerError,
@@ -42,7 +42,7 @@ def test_nasdaqdatalink_exceptions_no_retries(self, request_method):
 
         for expected_error in data_link_errors:
             self.assertRaises(
-                expected_error[2], lambda: Connection.request(request_method, 'databases'))
+                expected_error[2], lambda: connection.request(request_method, 'databases'))
 
     @parameterized.expand(['GET', 'POST'])
     def test_parse_error(self, request_method):
@@ -51,7 +51,7 @@ def test_parse_error(self, request_method):
                                "https://data.nasdaq.com/api/v3/databases",
                                body="not json", status=500)
         self.assertRaises(
-            DataLinkError, lambda: Connection.request(request_method, 'databases'))
+            DataLinkError, lambda: connection.request(request_method, 'databases'))
 
     @parameterized.expand(['GET', 'POST'])
     def test_non_data_link_error(self, request_method):
@@ -62,7 +62,7 @@ def test_non_data_link_error(self, request_method):
                                 {'foobar':
                                  {'code': 'blah', 'message': 'something went wrong'}}), status=500)
         self.assertRaises(
-            DataLinkError, lambda: Connection.request(request_method, 'databases'))
+            DataLinkError, lambda: connection.request(request_method, 'databases'))
 
     @parameterized.expand(['GET', 'POST'])
     @patch('nasdaqdatalink.connection.execute_request')
@@ -71,7 +71,7 @@ def test_build_request(self, request_method, mock):
         ApiConfig.api_version = '2015-04-09'
         params = {'per_page': 10, 'page': 2}
         headers = {'x-custom-header': 'header value'}
-        Connection.request(request_method, 'databases', headers=headers, params=params)
+        connection.request(request_method, 'databases', headers=headers, params=params)
         expected = call(request_method, 'https://data.nasdaq.com/api/v3/databases',
                         headers={'x-custom-header': 'header value',
                                  'x-api-token': 'api_token',

diff --git a/test/test_database.py b/test/test_database.py
@@ -7,7 +7,7 @@
 from six.moves.urllib.parse import parse_qs, urlparse
 
 from nasdaqdatalink.api_config import ApiConfig
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 from nasdaqdatalink.errors.data_link_error import (InternalServerError, DataLinkError)
 from nasdaqdatalink.model.database import Database
 from test.factories.database import DatabaseFactory
@@ -148,7 +148,7 @@ def test_get_bulk_download_url_without_download_type(self):
 
     def test_bulk_download_to_fileaccepts_download_type(self):
         m = mock_open()
-        with patch.object(Connection, 'request') as mock_method:
+        with patch.object(connection, 'request') as mock_method:
             mock_method.return_value.url = 'https://www.blah.com/download/db.zip'
             with patch('nasdaqdatalink.model.database.open', m, create=True):
                 self.database.bulk_download_to_file(

diff --git a/test/test_get.py b/test/test_get.py
@@ -8,7 +8,7 @@
 from nasdaqdatalink.model.merged_dataset import MergedDataset
 from nasdaqdatalink.get import get
 from nasdaqdatalink.api_config import ApiConfig
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 
 
 class GetSingleDatasetTest(unittest.TestCase):
@@ -36,7 +36,7 @@ def test_returns_numpys_when_requested(self):
         self.assertIsInstance(result, numpy.core.records.recarray)
 
     def test_setting_api_key_config(self):
-        mock_connection = Mock(wraps=Connection)
+        mock_connection = Mock(wraps=connection)
         with patch('nasdaqdatalink.connection.execute_request',
                    new=mock_connection.execute_request) as mock:
             ApiConfig.api_key = 'api_key_configured'

diff --git a/test/test_retries.py b/test/test_retries.py
@@ -1,7 +1,7 @@
 import unittest
 import json
 
-import nasdaqdatalink.connection as Connection
+import nasdaqdatalink.connection as connection
 from nasdaqdatalink.api_config import ApiConfig
 from test.factories.datatable import DatatableFactory
 from test.helpers.httpretty_extension import httpretty
@@ -28,6 +28,8 @@ def tearDown(self):
 class TestRetries(ModifyRetrySettingsTestCase):
 
     def setUp(self):
+        # reset session to None before every test
+        connection.session = None
         ApiConfig.use_retries = True
         super(TestRetries, self).setUp()
 
@@ -47,13 +49,13 @@ def setUpClass(cls):
     def test_modifying_use_retries(self):
         ApiConfig.use_retries = False
 
-        retries = Connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
+        retries = connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
         self.assertEqual(retries.total, 0)
 
     def test_modifying_number_of_retries(self):
         ApiConfig.number_of_retries = 3000
 
-        retries = Connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
+        retries = connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
 
         self.assertEqual(retries.total, ApiConfig.number_of_retries)
         self.assertEqual(retries.connect, ApiConfig.number_of_retries)
@@ -62,19 +64,19 @@ def test_modifying_number_of_retries(self):
     def test_modifying_retry_backoff_factor(self):
         ApiConfig.retry_backoff_factor = 3000
 
-        retries = Connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
+        retries = connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
         self.assertEqual(retries.backoff_factor, ApiConfig.retry_backoff_factor)
 
     def test_modifying_retry_status_codes(self):
         ApiConfig.retry_status_codes = [1, 2, 3]
 
-        retries = Connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
+        retries = connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
         self.assertEqual(retries.status_forcelist, ApiConfig.retry_status_codes)
 
     def test_modifying_max_wait_between_retries(self):
         ApiConfig.max_wait_between_retries = 3000
 
-        retries = Connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
+        retries = connection.get_session().get_adapter(ApiConfig.api_protocol).max_retries
         self.assertEqual(retries.BACKOFF_MAX, ApiConfig.max_wait_between_retries)
 
     @httpretty.enabled
@@ -87,7 +89,7 @@ def test_correct_response_returned_if_retries_succeed(self):
                                "https://data.nasdaq.com/api/v3/databases",
                                responses=mock_responses)
 
-        response = Connection.request('get', 'databases')
+        response = connection.request('get', 'databases')
         self.assertEqual(response.json(), self.datatable)
         self.assertEqual(response.status_code, self.success_response.status)
 
@@ -100,7 +102,7 @@ def test_correct_response_exception_raised_if_retries_fail(self):
                                "https://data.nasdaq.com/api/v3/databases",
                                responses=mock_responses)
 
-        self.assertRaises(InternalServerError, Connection.request, 'get', 'databases')
+        self.assertRaises(InternalServerError, connection.request, 'get', 'databases')
 
     @httpretty.enabled
     def test_correct_response_exception_raised_for_errors_not_in_retry_status_codes(self):
@@ -110,4 +112,4 @@ def test_correct_response_exception_raised_for_errors_not_in_retry_status_codes(
                                "https://data.nasdaq.com/api/v3/databases",
                                responses=mock_responses)
 
-        self.assertRaises(InternalServerError, Connection.request, 'get', 'databases')
+        self.assertRaises(InternalServerError, connection.request, 'get', 'databases')