Skip to content

REF: use astype_nansafe in Index.astype #38518

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 3 commits into from
Dec 16, 2020
Merged

REF: use astype_nansafe in Index.astype #38518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2591fa4
Use astype_nansafe in Index.astype
jbrockmendel Dec 16, 2020
18274b4
remove unnecesary error handling
jbrockmendel Dec 16, 2020
9c35a37
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Dec 16, 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
20 changes: 10 additions & 10 deletions pandas/core/indexes/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from pandas.util._decorators import Appender, cache_readonly, doc

from pandas.core.dtypes.cast import (
astype_nansafe,
find_common_type,
maybe_cast_to_integer_array,
maybe_promote,
Expand Down Expand Up @@ -693,22 +694,21 @@ def astype(self, dtype, copy=True):
if is_dtype_equal(self.dtype, dtype):
return self.copy() if copy else self

elif is_categorical_dtype(dtype):
from pandas.core.indexes.category import CategoricalIndex

return CategoricalIndex(
self._values, name=self.name, dtype=dtype, copy=copy
if needs_i8_conversion(dtype) and is_float_dtype(self.dtype):
# We can't put this into astype_nansafe bc astype_nansafe allows
# casting np.nan to NaT
raise TypeError(
f"Cannot convert {type(self).__name__} to dtype {dtype}; integer "
"values are required for conversion"
)

elif is_extension_array_dtype(dtype):
return Index(np.asarray(self), name=self.name, dtype=dtype, copy=copy)

try:
casted = self._values.astype(dtype, copy=copy)
except (TypeError, ValueError) as err:
casted = astype_nansafe(self._values, dtype=dtype, copy=True)
except TypeError as err:
raise TypeError(
f"Cannot cast {type(self).__name__} to dtype {dtype}"
) from err

return Index(casted, name=self.name, dtype=dtype)

_index_shared_docs[
Expand Down
19 changes: 0 additions & 19 deletions pandas/core/indexes/numeric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
from pandas._typing import Dtype, DtypeObj, Label
from pandas.util._decorators import doc

from pandas.core.dtypes.cast import astype_nansafe
from pandas.core.dtypes.common import (
is_bool,
is_bool_dtype,
is_dtype_equal,
is_extension_array_dtype,
is_float,
is_float_dtype,
is_integer_dtype,
Expand All @@ -21,8 +19,6 @@
is_scalar,
is_signed_integer_dtype,
is_unsigned_integer_dtype,
needs_i8_conversion,
pandas_dtype,
)
from pandas.core.dtypes.generic import ABCSeries
from pandas.core.dtypes.missing import is_valid_nat_for_dtype, isna
Expand Down Expand Up @@ -332,21 +328,6 @@ def inferred_type(self) -> str:
"""
return "floating"

@doc(Index.astype)
def astype(self, dtype, copy=True):
dtype = pandas_dtype(dtype)
if needs_i8_conversion(dtype):
raise TypeError(
f"Cannot convert Float64Index to dtype {dtype}; integer "
"values are required for conversion"
)
elif is_integer_dtype(dtype) and not is_extension_array_dtype(dtype):
# TODO(jreback); this can change once we have an EA Index type
# GH 13149
arr = astype_nansafe(self._values, dtype=dtype)
return Int64Index(arr, name=self.name)
return super().astype(dtype, copy=copy)

# ----------------------------------------------------------------
# Indexing Methods

Expand Down