Skip to content

REF: avoid special-casing Categorical astype #38530

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 9 commits into from
Dec 22, 2020
Merged

REF: avoid special-casing Categorical astype #38530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
df64bcd
API: CategoricalDtype.__eq__ with categories=None stricter
jbrockmendel Dec 16, 2020
85db060
Merge branch 'master' of https://github.com/pandas-dev/pandas into bu…
jbrockmendel Dec 16, 2020
3e4a3ed
Merge branch 'master' of https://github.com/pandas-dev/pandas into bu…
jbrockmendel Dec 16, 2020
28cba66
Test for is_dtype_equal matching dtype.__eq__
jbrockmendel Dec 17, 2020
c78aa77
REF: avoid special-casing Categorical astype
jbrockmendel Dec 16, 2020
5621418
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Dec 17, 2020
e218229
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Dec 22, 2020
4433788
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Dec 22, 2020
a346d35
remove duplicate check
jbrockmendel Dec 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
5 changes: 0 additions & 5 deletions pandas/core/indexes/category.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,11 +354,6 @@ def __contains__(self, key: Any) -> bool:

return contains(self, key, container=self._engine)

@doc(Index.astype)
def astype(self, dtype, copy=True):
res_data = self._data.astype(dtype, copy=copy)
return Index(res_data, name=self.name)

@doc(Index.fillna)
def fillna(self, value, downcast=None):
value = self._require_scalar(value)
Expand Down
11 changes: 7 additions & 4 deletions pandas/core/indexes/extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from pandas.errors import AbstractMethodError
from pandas.util._decorators import cache_readonly, doc

from pandas.core.dtypes.common import is_dtype_equal, is_object_dtype
from pandas.core.dtypes.common import is_dtype_equal, is_object_dtype, pandas_dtype
from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries

from pandas.core.arrays import ExtensionArray
Expand Down Expand Up @@ -294,9 +294,12 @@ def map(self, mapper, na_action=None):

@doc(Index.astype)
def astype(self, dtype, copy=True):
if is_dtype_equal(self.dtype, dtype) and copy is False:
# Ensure that self.astype(self.dtype) is self
return self
dtype = pandas_dtype(dtype)
if is_dtype_equal(self.dtype, dtype):
if not copy:
# Ensure that self.astype(self.dtype) is self
return self
return self.copy()

new_values = self._data.astype(dtype, copy=copy)

Expand Down
10 changes: 1 addition & 9 deletions pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,15 +649,7 @@ def astype(self, dtype, copy: bool = False, errors: str = "raise"):
def _astype(self, dtype: DtypeObj, copy: bool) -> ArrayLike:
values = self.values

if is_categorical_dtype(dtype):

if is_categorical_dtype(values.dtype):
# GH#10696/GH#18593: update an existing categorical efficiently
return values.astype(dtype, copy=copy)

return Categorical(values, dtype=dtype)

elif is_datetime64tz_dtype(dtype) and is_datetime64_dtype(values.dtype):
if is_datetime64tz_dtype(dtype) and is_datetime64_dtype(values.dtype):
# if we are passed a datetime64[ns, tz]
if copy:
# this should be the only copy
Expand Down