Skip to content

BUG/DEPR: deprecate Categorical take default behaviour + fix Series[categorical].take #20841

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 12 commits into from
Apr 30, 2018
Merged

BUG/DEPR: deprecate Categorical take default behaviour + fix Series[categorical].take #20841

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
644138f
Squashed commit of the following:
TomAugspurger Apr 27, 2018
b874eed
BUG/API: FutureWarning from Categorical.take indices
TomAugspurger Apr 27, 2018
07a561c
Linting
TomAugspurger Apr 27, 2018
aa7266c
Merge remote-tracking branch 'upstream/master' into categorical-take
TomAugspurger Apr 27, 2018
3a98ede
Updates
TomAugspurger Apr 27, 2018
69701f2
Clarified comment
TomAugspurger Apr 27, 2018
f777fa1
Merge remote-tracking branch 'upstream/master' into categorical-take
TomAugspurger Apr 28, 2018
d1c7e38
Actually use data
TomAugspurger Apr 28, 2018
6056f7a
typo
jorisvandenbossche Apr 28, 2018
f7e0e6d
update
TomAugspurger Apr 28, 2018
635db4f
Merge branch 'categorical-take' of https://github.com/TomAugspurger/p…
TomAugspurger Apr 28, 2018
12485c5
Moved to deprecations
TomAugspurger Apr 30, 2018
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
Prev Previous commit
Next Next commit
Clarified comment
  • Loading branch information
@TomAugspurger
TomAugspurger committed Apr 27, 2018
commit 69701f2bd0d384abc465cccfbdc315a8af216cd3
6 changes: 3 additions & 3 deletions pandas/core/arrays/categorical.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,9 +1780,9 @@ def take_nd(self, indexer, allow_fill=None, fill_value=None):
warn(_take_msg, FutureWarning, stacklevel=2)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe just put the warning inline here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That messes with the formatting.

allow_fill = True

if fill_value is None or isna(fill_value):
# The isna(fill_value) is included for backwards compatability.
# Categorical overrides any NA value with -1.
if isna(fill_value):
# For categorical, any NA value is considered a user-facing
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this condition tested?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep.

# NA value. Our storage NA value is -1.
fill_value = -1

codes = take(self._codes, indexer, allow_fill=allow_fill,
Expand Down