From 9bd6c357c9f2a2037175cd05e63332049264052e Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Sat, 11 Jan 2020 17:14:08 -0800 Subject: [PATCH 1/2] CLN: remove no-op from indexing --- pandas/core/indexing.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pandas/core/indexing.py b/pandas/core/indexing.py index ea59a6a49e649..0d8d0d01724a3 100755 --- a/pandas/core/indexing.py +++ b/pandas/core/indexing.py @@ -1340,9 +1340,6 @@ def _multi_take(self, tup: Tuple): } return o._reindex_with_indexers(d, copy=True, allow_dups=True) - def _convert_for_reindex(self, key, axis: int): - return key - def _handle_lowerdim_multi_index_axis0(self, tup: Tuple): # we have an axis0 multi-index, handle or raise axis = self.axis or 0 @@ -1539,10 +1536,6 @@ def _get_listlike_indexer(self, key, axis: int, raise_missing: bool = False): return ax[indexer], indexer if ax.is_unique and not getattr(ax, "is_overlapping", False): - # If we are trying to get actual keys from empty Series, we - # patiently wait for a KeyError later on - otherwise, convert - if len(ax) or not len(key): - key = self._convert_for_reindex(key, axis) indexer = ax.get_indexer_for(key) keyarr = ax.reindex(keyarr)[0] else: @@ -1756,7 +1749,8 @@ def __getitem__(self, key): if self._is_scalar_access(key): try: return self._getitem_scalar(key) - except (KeyError, IndexError, AttributeError): + except (IndexError, AttributeError): + # AttributeError for IntervalTree get_value pass return self._getitem_tuple(key) else: From f599057dc67596e0c9e506c59680488765032d99 Mon Sep 17 00:00:00 2001 From: Brock Mendel Date: Sat, 11 Jan 2020 17:33:14 -0800 Subject: [PATCH 2/2] restore excpetion --- pandas/core/indexing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/core/indexing.py b/pandas/core/indexing.py index 0d8d0d01724a3..cc11879142ffe 100755 --- a/pandas/core/indexing.py +++ b/pandas/core/indexing.py @@ -1749,7 +1749,7 @@ def __getitem__(self, key): if self._is_scalar_access(key): try: return self._getitem_scalar(key) - except (IndexError, AttributeError): + except (KeyError, IndexError, AttributeError): # AttributeError for IntervalTree get_value pass return self._getitem_tuple(key)