From 1d06fe52f84863add2da549ddd2083b5002fe0f9 Mon Sep 17 00:00:00 2001 From: sergeiQ Date: Tue, 7 Mar 2017 10:59:52 -0500 Subject: [PATCH] add support for 'code' column in datatables (#87) --- .gitignore | 4 +++- CHANGELOG.md | 5 +++++ quandl/get_table.py | 4 ++-- quandl/version.py | 2 +- test/test_connection.py | 2 +- test/test_get_table.py | 5 +++++ 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ef51a79..5e59685 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ /quandl.egg-info /build /dist -/tmp/ \ No newline at end of file +/tmp/ +.idea/* +venv \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index f94a81d..0aa52a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### 3.1.0 - 2017-03-07 + +* Bug: support column with a name 'code' + + ### 3.0.1 - 2016-05-25 * Handle unexpected errors diff --git a/quandl/get_table.py b/quandl/get_table.py index 9648cc1..43818d0 100644 --- a/quandl/get_table.py +++ b/quandl/get_table.py @@ -6,7 +6,7 @@ import os -def get_table(code, **options): +def get_table(datatable_code, **options): if 'paginate' in options.keys(): paginate = options.pop('paginate') else: @@ -16,7 +16,7 @@ def get_table(code, **options): page_count = 0 while True: next_options = copy.deepcopy(options) - next_data = Datatable(code).data(params=next_options) + next_data = Datatable(datatable_code).data(params=next_options) if data is None: data = next_data diff --git a/quandl/version.py b/quandl/version.py index a29b27e..59a2fe6 100644 --- a/quandl/version.py +++ b/quandl/version.py @@ -1 +1 @@ -VERSION = '3.0.1' +VERSION = '3.1.0' diff --git a/test/test_connection.py b/test/test_connection.py index 1977f5b..e672b5e 100644 --- a/test/test_connection.py +++ b/test/test_connection.py @@ -67,6 +67,6 @@ def test_build_request(self, mock): 'accept': ('application/json, ' 'application/vnd.quandl+json;version=2015-04-09'), 'request-source': 'python', - 'request-source-version': '3.0.1'}, + 'request-source-version': '3.1.0'}, params={'per_page': 10, 'page': 2}) self.assertEqual(mock.call_args, expected) diff --git a/test/test_get_table.py b/test/test_get_table.py index 5f651a8..7dc255b 100644 --- a/test/test_get_table.py +++ b/test/test_get_table.py @@ -37,3 +37,8 @@ def tearDownClass(cls): def test_datatable_returns_datatable_object(self, mock): df = quandl.get_table('ZACKS/FC', params={}) self.assertIsInstance(df, pandas.core.frame.DataFrame) + + @patch('quandl.connection.Connection.request') + def test_datatable_with_code_returns_datatable_object(self, mock): + df = quandl.get_table('AR/MWCF', code="ICEP_WAC_Z2017_S") + self.assertIsInstance(df, pandas.core.frame.DataFrame)