BUG: fix indexing error when selecting section of a hierarchically-in…

…dexed DataFrame row, close #1013

RELEASE.rst

@@ -43,6 +43,8 @@ pandas 0.7.3
 **Bug fixes**
 
   - Don't attach nonsense 'result' name to groupby results (GH #995)
+  - Fix logic error when selecting part of a row in a DataFrame with a
+    MultiIndex index (GH #1013)
 
 pandas 0.7.2
 ============

pandas/core/indexing.py

@@ -137,7 +137,7 @@ def _getitem_lowerdim(self, tup):
         # df.ix[d1:d2, 0] -> columns first (True)
         # df.ix[0, ['C', 'B', A']] -> rows first (False)
         for i, key in enumerate(tup):
-            if _is_label_like(key):
+            if _is_label_like(key) or isinstance(key, tuple):
                 section = self._getitem_axis(key, axis=i)
 
                 # might have been a MultiIndex

pandas/tests/test_multilevel.py

@@ -255,6 +255,15 @@ def test_getitem_tuple_plus_slice(self):
         assert_series_equal(result, expected)
         assert_series_equal(result, expected2)
 
+    def test_getitem_setitem_tuple_plus_columns(self):
+        # GH #1013
+
+        df = self.ymd[:5]
+
+        result = df.ix[(2000, 1, 6), ['A', 'B', 'C']]
+        expected = df.ix[2000, 1, 6][['A', 'B', 'C']]
+        assert_series_equal(result, expected)
+
     def test_xs(self):
         xs = self.frame.xs(('bar', 'two'))
         xs2 = self.frame.ix[('bar', 'two')]
@@ -1252,6 +1261,7 @@ def test_unicode_repr_issues(self):
         # NumPy bug
         # repr(index.get_level_values(1))
 
+
 if __name__ == '__main__':
 
     # unittest.main()