CLN: Resubmit of GH14700. Fixes GH14554. Errors other than Indexing…
IdnexError and KeyError now bubble up appropriately.
closes #14554
Author: Chris Ham <chris@christopher-ham.com>
Closes #14912 from clham/gh14554-b and squashes the following commits:
458c0cc
[Chris Ham] CLN: Resubmit of GH14700. Fixes GH14554. Errors other than IndexingError and KeyError now bubble up appropriately.
This commit is contained in:
parent
8e630b6301
commit
3ccb50131b
|
@ -70,6 +70,7 @@ Bug Fixes
|
|||
- Compat with python 3.6 for Timestamp pickles (:issue:`14689`)
|
||||
- Bug in resampling a ``DatetimeIndex`` in local TZ, covering a DST change, which would raise ``AmbiguousTimeError`` (:issue:`14682`)
|
||||
|
||||
- Bug in indexing that transformed ``RecursionError`` into ``KeyError`` or ``IndexingError`` (:issue:`14554`)
|
||||
|
||||
|
||||
- Bug in ``HDFStore`` when writing a ``MultiIndex`` when using ``data_columns=True`` (:issue:`14435`)
|
||||
|
|
|
@ -848,7 +848,7 @@ class _NDFrameIndexer(object):
|
|||
[(a, self._convert_for_reindex(t, axis=o._get_axis_number(a)))
|
||||
for t, a in zip(tup, o._AXIS_ORDERS)])
|
||||
return o.reindex(**d)
|
||||
except:
|
||||
except(KeyError, IndexingError):
|
||||
raise self._exception
|
||||
|
||||
def _convert_for_reindex(self, key, axis=0):
|
||||
|
|
Loading…
Reference in New Issue