Applies additional null type, per OlegShteynbuk pydata#342

Author: rgkimball

pandas_datareader/base.py

@@ -136,7 +136,8 @@ def _get_crumb(self, *args):
         raise NotImplementedError("Subclass has not implemented method.")
 
     def _read_lines(self, out):
-        rs = read_csv(out, index_col=0, parse_dates=True, na_values='-')[::-1]
+        rs = read_csv(out, index_col=0, parse_dates=True,
+                      na_values=('-', 'null'))[::-1]
         # Yahoo! Finance sometimes does this awesome thing where they
         # return 2 rows for the most recent business day
         if len(rs) > 2 and rs.index[-1] == rs.index[-2]:  # pragma: no cover

pandas_datareader/tests/yahoo/test_yahoo.py

@@ -10,7 +10,9 @@
 
 import pandas_datareader.data as web
 from pandas_datareader.data import YahooDailyReader
+from pandas_datareader._utils import RemoteDataError
 from pandas_datareader.yahoo.quotes import _yahoo_codes
+from pandas_datareader._testing import skip_on_exception
 
 
 class TestYahoo(object):
@@ -93,12 +95,14 @@ def test_get_data_single_symbol(self):
         # just test that we succeed
         web.get_data_yahoo('GOOG')
 
+    @skip_on_exception(RemoteDataError)
     def test_get_data_adjust_price(self):
         goog = web.get_data_yahoo('GOOG')
         goog_adj = web.get_data_yahoo('GOOG', adjust_price=True)
         assert 'Adj Close' not in goog_adj.columns
         assert (goog['Open'] * goog_adj['Adj_Ratio']).equals(goog_adj['Open'])
 
+    @skip_on_exception(RemoteDataError)
     def test_get_data_interval(self):
         # daily interval data
         pan = web.get_data_yahoo('XOM', '2013-01-01',
@@ -119,11 +123,13 @@ def test_get_data_interval(self):
         with pytest.raises(ValueError):
             web.get_data_yahoo('XOM', interval='NOT VALID')
 
+    @skip_on_exception(RemoteDataError)
     def test_get_data_multiple_symbols(self):
         # just test that we succeed
         sl = ['AAPL', 'AMZN', 'GOOG']
         web.get_data_yahoo(sl, '2012')
 
+    @skip_on_exception(RemoteDataError)
     def test_get_data_multiple_symbols_two_dates(self):
         pan = web.get_data_yahoo(['GE', 'MSFT', 'INTC'], 'JAN-01-12',
                                  'JAN-31-12')
@@ -141,6 +147,7 @@ def test_get_data_multiple_symbols_two_dates(self):
         result = df[(df.index >= 'Jan-15-12') & (df.index <= 'Jan-20-12')]
         assert expected.shape == result.shape
 
+    @skip_on_exception(RemoteDataError)
     def test_get_date_ret_index(self):
         pan = web.get_data_yahoo(['GE', 'INTC', 'IBM'], '1977', '1987',
                                  ret_index=True)
@@ -154,6 +161,7 @@ def test_get_date_ret_index(self):
         # sanity checking
         assert np.issubdtype(pan.values.dtype, np.floating)
 
+    @skip_on_exception(RemoteDataError)
     def test_get_data_yahoo_actions(self):
         start = datetime(1990, 1, 1)
         end = datetime(2000, 4, 5)
@@ -187,6 +195,7 @@ def test_yahoo_reader_class(self):
         r = YahooDailyReader('GOOG', session=session)
         assert r.session is session
 
+    @skip_on_exception(RemoteDataError)
     def test_yahoo_DataReader(self):
         start = datetime(2010, 1, 1)
         end = datetime(2015, 5, 9)
@@ -210,8 +219,9 @@ def test_yahoo_DataReader(self):
                            index=exp_idx)
         exp.index.name = 'Date'
 
-        tm.assert_frame_equal(result, exp)
+        tm.assert_frame_equal(result.sort(axis=1), exp.sort(axis=1))
 
+    @skip_on_exception(RemoteDataError)
     def test_yahoo_DataReader_multi(self):
         start = datetime(2010, 1, 1)
         end = datetime(2015, 5, 9)