Merge pull request #74 from femtotrader/options_datasource_none

BUG: Options dispatch shouldn't return None when data_source is None

Author: davidastephens

pandas_datareader/data.py

@@ -88,7 +88,7 @@ def Options(symbol, data_source=None):
         warnings.warn("Options(symbol) is deprecated, use Options(symbol,"
                         " data_source) instead", FutureWarning)
         data_source = "yahoo"
-    elif data_source == "yahoo":
+    if data_source == "yahoo":
         return YahooOptions(symbol)
     else:
         raise NotImplementedError("currently only yahoo supported")

pandas_datareader/tests/test_data.py

@@ -329,6 +329,10 @@ def test_get_near_stock_price(self):
             raise nose.SkipTest(e)
         self.assertTrue(len(options) > 1)
 
+    def test_options_is_not_none(self):
+        option = web.Options('aapl')
+        self.assertTrue(option is not None)
+
     def test_get_call_data(self):
         try:
             calls = self.aapl.get_call_data(expiry=self.expiry)