BUG: fix buglet with xs with level, GH #371

Author: wesm

pandas/core/indexing.py

@@ -97,7 +97,7 @@ def _getitem_tuple(self, tup):
         if isinstance(self.obj._get_axis(0), MultiIndex):
             try:
                 return self._get_label(tup, axis=0)
-            except (KeyError, TypeError):
+            except Exception:
                 pass
 
         try:

pandas/tests/test_multilevel.py

@@ -222,6 +222,14 @@ def test_xs_level(self):
 
         assert_frame_equal(result, expected)
 
+        index = MultiIndex.from_tuples([('x', 'y', 'z'), ('a', 'b', 'c'),
+                                        ('p', 'q', 'r')])
+        df = DataFrame(np.random.randn(3, 5), index=index)
+        result = df.xs('c', level=2)
+        expected = df[1:2]
+        expected.index = expected.index.droplevel(2)
+        assert_frame_equal(result, expected)
+
     def test_xs_level_series(self):
         s = self.frame['A']
         result = s[:, 'two']