BUG: close #837, excelfile throws an exception for two-line file

Author: adamklein

RELEASE.rst

@@ -50,6 +50,7 @@ pandas 0.7.1
   - Fix exception thrown on np.diff (#816)
   - Fix to_records where columns are non-strings (#822)
   - Fix Index.intersection where indices have incomparable types (#811)
+  - Fix ExcelFile throwing an exception for two-line file (#837)
 
 pandas 0.7.0
 ============

pandas/io/parsers.py

@@ -350,7 +350,10 @@ def _next_line(self):
             while self.pos in self.skiprows:
                 self.pos += 1
 
-            line = self.data[self.pos]
+            try:
+                line = self.data[self.pos]
+            except IndexError:
+                raise StopIteration
         else:
             while self.pos in self.skiprows:
                 self.data.next()

pandas/io/tests/test2.xls

@@ -219,6 +219,12 @@ def test_read_csv_no_index_name(self):
         self.assert_(df.ix[:, ['A', 'B', 'C', 'D']].values.dtype == np.float64)
         assert_frame_equal(df, df2)
 
+    def test_excel_stop_iterator(self):
+        excel_data = ExcelFile(os.path.join(self.dirpath, 'test2.xls'))
+        parsed = excel_data.parse('Sheet1')
+        expected = DataFrame([['aaaa','bbbbb']], columns=['Test', 'Test1'])
+        assert_frame_equal(parsed, expected)
+
     def test_excel_table(self):
         try:
             import xlrd