Merge pull request #6114 from y-p/PR_GH6105

BUG: get_options_data should validate it's arguments GH6105

Author: y-p

doc/source/release.rst

@@ -156,6 +156,7 @@ Bug Fixes
   - Subtle ``iloc`` indexing bug, surfaced in (:issue:`6059`)
   - Bug with insert of strings into DatetimeIndex (:issue:`5818`)
   - Fixed unicode bug in to_html/HTML repr (:issue:`6098`)
+  - Fixed missing arg validation in get_options_data (:issue:`6105`)
 
 pandas 0.13.0
 -------------

pandas/io/data.py

@@ -632,6 +632,10 @@ def get_options_data(self, month=None, year=None, expiry=None):
     _OPTIONS_BASE_URL = 'http://finance.yahoo.com/q/op?s={sym}'
 
     def _get_option_data(self, month, year, expiry, table_loc, name):
+        if (month is None or year is None) and expiry is None:
+            msg = "You must specify either (`year` and `month`) or `expiry`."
+            raise ValueError(msg)
+
         year, month = self._try_parse_dates(year, month, expiry)
 
         url = self._OPTIONS_BASE_URL.format(sym=self.symbol)

pandas/io/tests/test_data.py

@@ -266,6 +266,12 @@ def test_get_options_data(self):
             assert len(calls)>1
             assert len(puts)>1
 
+    def test_get_options_data(self):
+
+        # regression test GH6105
+        self.assertRaises(ValueError,self.aapl.get_options_data,month=3)
+        self.assertRaises(ValueError,self.aapl.get_options_data,year=1992)
+
     @network
     def test_get_near_stock_price(self):
         try: