Merge branch 'main' into auth-session-support

runawaycoast · web-flow · commit 65f2baa7d804 · 2022-08-11T17:16:13.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.0.3 - 2022-08-07
+
+* Fixes an issue with errors not being reported correctly.
+
 ### 1.0.2 - 2022-05-02
 
 * Fixes an issue with sessions not respecting proxy settings.
diff --git a/nasdaqdatalink/connection.py b/nasdaqdatalink/connection.py
@@ -108,11 +108,11 @@ def handle_api_error(cls, resp):
 
         # if our app does not form a proper data_link_error response
         # throw generic error
-        if 'error' not in error_body:
+        if 'quandl_error' not in error_body:
             raise DataLinkError(http_status=resp.status_code, http_body=resp.text)
 
-        code = error_body['error']['code']
-        message = error_body['error']['message']
+        code = error_body['quandl_error']['code']
+        message = error_body['quandl_error']['message']
         prog = re.compile('^QE([a-zA-Z])x')
         if prog.match(code):
             code_letter = prog.match(code).group(1)
diff --git a/nasdaqdatalink/version.py b/nasdaqdatalink/version.py
@@ -1 +1 @@
-VERSION = '1.0.2'
+VERSION = '1.0.3'
diff --git a/test/test_connection.py b/test/test_connection.py
@@ -36,7 +36,7 @@ def test_nasdaqdatalink_exceptions_no_retries(self, request_method):
         httpretty.register_uri(getattr(httpretty, request_method),
                                "https://data.nasdaq.com/api/v3/databases",
                                responses=[httpretty.Response(body=json.dumps(
-                                   {'error':
+                                   {'quandl_error':
                                     {'code': x[0], 'message': 'something went wrong'}}),
                                    status=x[1]) for x in data_link_errors]
                                )
diff --git a/test/test_database.py b/test/test_database.py
@@ -179,7 +179,7 @@ def test_bulk_download_raises_exception_when_error_response(self):
                                re.compile(
                                    'https://data.nasdaq.com/api/v3/databases/*'),
                                body=json.dumps(
-                                   {'error':
+                                   {'quandl_error':
                                     {'code': 'QEMx01', 'message': 'something went wrong'}}),
                                status=500)
 
diff --git a/test/test_datatable.py b/test/test_datatable.py
@@ -186,7 +186,7 @@ def test_bulk_download_table_raises_exception_when_error_response(self, request_
         ApiConfig.number_of_retries = 2
         error_responses = [httpretty.Response(
             body=json.dumps(
-              {'error': {'code': 'QEMx01', 'message': 'something went wrong'}}
+              {'quandl_error': {'code': 'QEMx01', 'message': 'something went wrong'}}
             ),
             status=500)]
 
diff --git a/test/test_retries.py b/test/test_retries.py
@@ -39,7 +39,7 @@ def setUpClass(cls):
 
         cls.error_response = httpretty.Response(
             body=json.dumps(
-              {'error': {'code': 'QEMx01', 'message': 'something went wrong'}}
+              {'quandl_error': {'code': 'QEMx01', 'message': 'something went wrong'}}
             ),
             status=500)
         cls.success_response = httpretty.Response(body=json.dumps(cls.datatable), status=200)

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ def test_nasdaqdatalink_exceptions_no_retries(self, request_method):`
`36`	`36`	`httpretty.register_uri(getattr(httpretty, request_method),`
`37`	`37`	`"https://data.nasdaq.com/api/v3/databases",`
`38`	`38`	`responses=[httpretty.Response(body=json.dumps(`
`39`		`- {'error':`
	`39`	`+ {'quandl_error':`
`40`	`40`	`{'code': x[0], 'message': 'something went wrong'}}),`
`41`	`41`	`status=x[1]) for x in data_link_errors]`
`42`	`42`	`)`