Merge branch 'fix-fancy-indexing-empty-list' of https://github.com/immerrr/pandas into immerrr-fix-fancy-indexing-empty-list

Conflicts:
	doc/source/release.rst

Author: jreback

doc/source/release.rst

@@ -115,7 +115,7 @@ API Changes
 - Better propagation/preservation of Series names when performing groupby
   operations:
   - ``SeriesGroupBy.agg`` will ensure that the name attribute of the original
-    series is propagated to the result (:issue:`6265`). 
+    series is propagated to the result (:issue:`6265`).
   - If the function provided to ``GroupBy.apply`` returns a named series, the
     name of the series will be kept as the name of the column index of the
     DataFrame returned by ``GroupBy.apply`` (:issue:`6124`).  This facilitates
@@ -218,6 +218,7 @@ Bug Fixes
 - Bug in ``DataFrame.to_stata`` that lead to data loss in certain cases, and could exported using the
   wrong data types and missing values (:issue:`6335`)
 - Inconsistent types in Timestamp addition/subtraction (:issue:`6543`)
+- Bug in indexing: empty list lookup caused ``IndexError`` exceptions (:issue:`6536`, :issue:`6551`)
 
 
 pandas 0.13.1

pandas/core/indexing.py

@@ -1555,6 +1555,10 @@ def _maybe_convert_indices(indices, n):
     """
     if isinstance(indices, list):
         indices = np.array(indices)
+        if len(indices) == 0:
+            # If list is empty, np.array will return float and cause indexing
+            # errors.
+            return np.empty(0, dtype=np.int_)
 
     mask = indices < 0
     if mask.any():

pandas/tests/test_indexing.py

@@ -3175,6 +3175,26 @@ def test_set_ix_out_of_bounds_axis_1(self):
         df = pd.DataFrame(randn(5, 2), index=["row%s" % i for i in range(5)], columns=["col%s" % i for i in range(2)])
         self.assertRaises(ValueError, df.ix.__setitem__, (0 , 2), 100)
 
+    def test_iloc_empty_list_indexer_is_ok(self):
+        from pandas.util.testing import makeCustomDataframe as mkdf
+        df = mkdf(5, 2)
+        assert_frame_equal(df.iloc[:,[]], df.iloc[:, :0])  # vertical empty
+        assert_frame_equal(df.iloc[[],:], df.iloc[:0, :])  # horizontal empty
+
+    # FIXME: fix loc & xs
+    def test_loc_empty_list_indexer_is_ok(self):
+        raise nose.SkipTest('loc discards columns names')
+        from pandas.util.testing import makeCustomDataframe as mkdf
+        df = mkdf(5, 2)
+        assert_frame_equal(df.loc[:,[]], df.iloc[:, :0])  # vertical empty
+        assert_frame_equal(df.loc[[],:], df.iloc[:0, :])  # horizontal empty
+
+    def test_ix_empty_list_indexer_is_ok(self):
+        raise nose.SkipTest('ix discards columns names')
+        from pandas.util.testing import makeCustomDataframe as mkdf
+        df = mkdf(5, 2)
+        assert_frame_equal(df.ix[:,[]], df.iloc[:, :0])  # vertical empty
+        assert_frame_equal(df.ix[[],:], df.iloc[:0, :])  # horizontal empty
 
 if __name__ == '__main__':
     import nose