Skip to content

validate fill_value in IntervalArray.take unconditionally #36538

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2020
Merged

validate fill_value in IntervalArray.take unconditionally #36538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5258c15
validate fill_value in IntervalArray.take unconditionally
jbrockmendel Sep 22, 2020
f6ab6f2
Merge branch 'master' of https://github.com/pandas-dev/pandas into in…
jbrockmendel Sep 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pandas/core/arrays/interval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,9 +812,7 @@ def take(self, indices, allow_fill=False, fill_value=None, axis=None, **kwargs):

fill_left = fill_right = fill_value
if allow_fill:
if (np.asarray(indices) == -1).any():
# We have excel tests that pass fill_value=True, xref GH#36466
fill_left, fill_right = self._validate_fill_value(fill_value)
fill_left, fill_right = self._validate_fill_value(fill_value)

left_take = take(
self.left, indices, allow_fill=allow_fill, fill_value=fill_left
Expand Down
4 changes: 3 additions & 1 deletion pandas/io/formats/excel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,9 @@ def _format_hierarchical_rows(self):
):

values = levels.take(
level_codes, allow_fill=levels._can_hold_na, fill_value=True
level_codes,
allow_fill=levels._can_hold_na,
fill_value=levels._na_value,
)

for i in spans:
Expand Down