Merge pull request #649 from oceanapplications/patch-2

Limit data use

Author: bashtage

pandas_datareader/iex/daily.py

@@ -101,6 +101,16 @@ def _range_string_from_date(self):
         elif 1 <= years < 2:
             return "2y"
         elif 0 <= years < 1:
+            delta_days = (datetime.datetime.now() - self.start).days
+            if 0 <= delta_days < 6:
+                return "5d"
+            elif 6 <= delta_days < 28:
+                return "1m"
+            elif 28 <= delta_days < 84:
+                return "3m"
+            elif 84 <= delta_days < 168:
+                return "6m"
+
             return "1y"
         else:
             raise ValueError(

pandas_datareader/tests/test_iex_daily.py

@@ -1,12 +1,13 @@
-from datetime import datetime
+from datetime import date, datetime, timedelta
+
 import os
 
 from pandas import DataFrame, MultiIndex
 
 import pytest
 
 import pandas_datareader.data as web
-
+from pandas_datareader.iex.daily import IEXDailyReader
 
 @pytest.mark.skipif(os.getenv("IEX_SANDBOX") != 'enable',
                     reason='All tests must be run in sandbox mode')
@@ -66,3 +67,39 @@ def test_multiple_symbols_2(self):
 
         assert len(a) == 73
         assert len(t) == 73
+
+    def test_range_string_from_date(self):
+        syms = ["AAPL"]
+
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=5),
+                              end=date.today()
+                              )._range_string_from_date() == '5d'
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=27),
+                              end=date.today()
+                              )._range_string_from_date() == '1m'
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=83),
+                              end=date.today()
+                              )._range_string_from_date() == '3m'
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=167),
+                              end=date.today()
+                              )._range_string_from_date() == '6m'
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=170),
+                              end=date.today()
+                              )._range_string_from_date() == '1y'
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=365),
+                              end=date.today()
+                              )._range_string_from_date() == '2y'
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=730),
+                              end=date.today()
+                              )._range_string_from_date() == '5y'
+        assert IEXDailyReader(symbols=syms,
+                              start=date.today() - timedelta(days=1826),
+                              end=date.today()
+                              )._range_string_from_date() == 'max'