Remove code

Author: phofl

pandas/core/indexes/category.py

@@ -582,10 +582,6 @@ def _convert_list_indexer(self, keyarr):
         # Return our indexer or raise if all of the values are not included in
         # the categories
 
-        if self.categories._defer_to_indexing:
-            indexer = self.categories._convert_list_indexer(keyarr)
-            return Index(self.codes).get_indexer_for(indexer)
-
         msg = "a list-indexer must only include values that are in the categories"
         if self.hasnans:
             msg += " or NA"

pandas/core/indexes/interval.py

@@ -841,13 +841,7 @@ def _convert_list_indexer(self, keyarr):
         we are passed a list-like indexer. Return the
         indexer for matching intervals.
         """
-        locs = self.get_indexer_for(keyarr)
-
-        # we have missing values
-        if (locs == -1).any():
-            raise KeyError(keyarr[locs == -1].tolist())
-
-        return locs
+        return self.get_indexer_for(keyarr)
 
     # --------------------------------------------------------------------
 

pandas/tests/indexing/interval/test_interval.py

@@ -65,10 +65,13 @@ def test_non_matching(self):
 
         # this is a departure from our current
         # indexing scheme, but simpler
-        with pytest.raises(KeyError, match=r"^\[-1\]$"):
+        msg = r"Passing list-likes to \.loc or \[\] with any missing labels is no " \
+              r"longer supported. The following labels were missing: " \
+              r"Int64Index\(\[-1\], dtype='int64'\)"
+        with pytest.raises(KeyError, match=msg):
             s.loc[[-1, 3, 4, 5]]
 
-        with pytest.raises(KeyError, match=r"^\[-1\]$"):
+        with pytest.raises(KeyError, match=msg):
             s.loc[[-1, 3]]
 
     @pytest.mark.arm_slow

pandas/tests/indexing/interval/test_interval_new.py

@@ -203,14 +203,15 @@ def test_loc_with_overlap(self):
 
         with pytest.raises(KeyError, match=re.escape("Interval(3, 5, closed='right')")):
             s.loc[Interval(3, 5)]
-
-        with pytest.raises(KeyError, match=r"^\[Interval\(3, 5, closed='right'\)\]$"):
+        msg = r"None of \[IntervalIndex\(\[\(3, 5\]\],\\n \s* closed='right',\\n \s* " \
+              r"dtype='interval\[int64\]'\)\] are in the \[index\]"
+        with pytest.raises(KeyError, match=msg):
             s.loc[[Interval(3, 5)]]
 
         with pytest.raises(KeyError, match=re.escape("Interval(3, 5, closed='right')")):
             s[Interval(3, 5)]
 
-        with pytest.raises(KeyError, match=r"^\[Interval\(3, 5, closed='right'\)\]$"):
+        with pytest.raises(KeyError, match=msg):
             s[[Interval(3, 5)]]
 
         # slices with interval (only exact matches)