Author: femtotrader

pandas_datareader/data.py

@@ -5,17 +5,17 @@
 """
 
 from pandas_datareader.date_chunks import _sanitize_dates
-from .datareaders.google_finance import get_data_google
-from .datareaders.google_finance.quotes import get_quote_google
+from pandas_datareader.datareaders.google import get_data_google
+from pandas_datareader.datareaders.google.quotes import get_quote_google
 
-from .datareaders.yahoo_finance import get_data_yahoo
-from .datareaders.yahoo_finance.quotes import get_quote_yahoo
-from .datareaders.yahoo_finance.options import Options
-from .datareaders.yahoo_finance.actions import get_data_yahoo_actions
-from .datareaders.yahoo_finance.components import get_components_yahoo
+from pandas_datareader.datareaders.yahoo import get_data_yahoo
+from pandas_datareader.datareaders.yahoo.quotes import get_quote_yahoo
+from pandas_datareader.datareaders.yahoo.options import Options
+from pandas_datareader.datareaders.yahoo.actions import get_data_yahoo_actions
+from pandas_datareader.datareaders.yahoo.components import get_components_yahoo
 
-from .datareaders.fred import get_data_fred
-from .datareaders.famafrench import get_data_famafrench
+from pandas_datareader.datareaders.fred import get_data_fred
+from pandas_datareader.datareaders.famafrench import get_data_famafrench
 
 def DataReader(name, data_source=None, start=None, end=None,
                retry_count=3, pause=0.001):
@@ -74,4 +74,6 @@ def DataReader(name, data_source=None, start=None, end=None,
         return get_data_fred(name, start, end)
     elif data_source == "famafrench":
         return get_data_famafrench(name)
-
+    else:
+        raise NotImplementedError(
+                "data_source=%r is not implemented" % data_source)

pandas_datareader/datareaders/google_finance/__init__.py renamed to pandas_datareader/datareaders/google/__init__.py

@@ -1,4 +1,5 @@
 from pandas_datareader.shared import _get_data_from
+from pandas_datareader.datareaders.google.daily import _get_hist_google
 
 def get_data_google(symbols=None, start=None, end=None, retry_count=3,
                     pause=0.001, chunksize=25):
@@ -30,4 +31,4 @@ def get_data_google(symbols=None, start=None, end=None, retry_count=3,
     hist_data : DataFrame (str) or Panel (array-like object, DataFrame)
     """
     return _get_data_from(symbols, start, end, None, retry_count, pause,
-                          chunksize, 'google')
+                          chunksize, _get_hist_google)

pandas_datareader/datareaders/google_finance/daily.py renamed to pandas_datareader/datareaders/google/daily.py

@@ -1,4 +1,5 @@
 from pandas_datareader.shared import _get_data_from
+from pandas_datareader.datareaders.yahoo.daily import _get_hist_yahoo
 
 def get_data_yahoo(symbols=None, start=None, end=None, retry_count=3,
                    pause=0.001, adjust_price=False, ret_index=False,
@@ -42,7 +43,7 @@ def get_data_yahoo(symbols=None, start=None, end=None, retry_count=3,
     if interval not in ['d', 'w', 'm', 'v']:
         raise ValueError("Invalid interval: valid values are 'd', 'w', 'm' and 'v'")
     hist_data = _get_data_from(symbols, start, end, interval, retry_count, pause, \
-                    chunksize, 'yahoo')
+                    chunksize, _get_hist_yahoo)
     if ret_index:
         hist_data['Ret_Index'] = _calc_return_index(hist_data['Adj Close'])
     if adjust_price:

pandas_datareader/datareaders/google_finance/quotes.py renamed to pandas_datareader/datareaders/google/quotes.py

@@ -4,24 +4,16 @@
 from pandas.core.common import PandasError
 from pandas import Panel, DataFrame
 
-from .shared.date_chunks import _in_chunks
-
-from .shared.datareaders.google_finance.daily import _get_hist_google
-from .shared.datareaders.yahoo_finance.daily import _get_hist_yahoo
-
+from pandas_datareader.date_chunks import _in_chunks
 
 class SymbolWarning(UserWarning):
     pass
 
 class RemoteDataError(PandasError, IOError):
     pass
 
-_source_functions = {'google': _get_hist_google, 'yahoo': _get_hist_yahoo}
-
 def _get_data_from(symbols, start, end, interval, retry_count, pause,
-                   chunksize, source):
-
-    src_fn = _source_functions[source]
+                   chunksize, src_fn):
 
     # If a single symbol, (e.g., 'GOOG')
     if isinstance(symbols, (compat.string_types, int)):

pandas_datareader/datareaders/yahoo_finance/__init__.py renamed to pandas_datareader/datareaders/yahoo/__init__.py

@@ -26,7 +26,7 @@
 import pandas_datareader.data as web
 from pandas_datareader.data import DataReader
 from pandas_datareader.shared import SymbolWarning, RemoteDataError
-from pandas_datareader.datareaders.yahoo_finance.quotes import _yahoo_codes
+from pandas_datareader.datareaders.yahoo.quotes import _yahoo_codes
 
 def _skip_if_no_lxml():
     try: