Skip to content

BUG: Ensure .astype doesn't use PandasArray #24866

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 5 commits into from
Apr 28, 2019
Merged

BUG: Ensure .astype doesn't use PandasArray #24866

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9f74737
BUG: Ensure .astype doesn't use PandasArray
TomAugspurger Jan 21, 2019
e881e6e
Merge remote-tracking branch 'upstream/master' into astype-pandas-dtype
TomAugspurger Jan 22, 2019
548377f
simplify, move
TomAugspurger Jan 22, 2019
d6de645
Move to make_block
TomAugspurger Jan 22, 2019
6a37fa1
Merge branch 'master' into PR_TOOL_MERGE_PR_24866
jreback Apr 28, 2019
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
17 changes: 5 additions & 12 deletions pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

import pandas.core.algorithms as algos
from pandas.core.arrays import (
Categorical, DatetimeArray, ExtensionArray, TimedeltaArray)
Categorical, DatetimeArray, ExtensionArray, PandasDtype, TimedeltaArray)
from pandas.core.base import PandasObject
import pandas.core.common as com
from pandas.core.indexes.datetimes import DatetimeIndex
Expand Down Expand Up @@ -591,23 +591,16 @@ def _astype(self, dtype, copy=False, errors='raise', values=None,

return self.make_block(Categorical(self.values, dtype=dtype))

# convert dtypes if needed
dtype = pandas_dtype(dtype)
if isinstance(dtype, PandasDtype):
dtype = dtype.numpy_dtype

# astype processing
if is_dtype_equal(self.dtype, dtype):
if copy:
return self.copy()
return self

klass = None
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I believe that this is unnecessary now... The .astype should get us an array of the correct type, and from there we'll get the correct block in make_block.

if is_sparse(self.values):
# special case sparse, Series[Sparse].astype(object) is sparse
klass = ExtensionBlock
elif is_object_dtype(dtype):
klass = ObjectBlock
elif is_extension_array_dtype(dtype):
klass = ExtensionBlock

try:
# force the copy here
if values is None:
Expand Down Expand Up @@ -640,7 +633,7 @@ def _astype(self, dtype, copy=False, errors='raise', values=None,
pass

newb = make_block(values, placement=self.mgr_locs,
klass=klass, ndim=self.ndim)
ndim=self.ndim)
except Exception: # noqa: E722
if errors == 'raise':
raise
Expand Down
8 changes: 8 additions & 0 deletions pandas/tests/series/test_internals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,14 @@ def test_constructor_no_pandas_array(self):
tm.assert_series_equal(ser, result)
assert isinstance(result._data.blocks[0], IntBlock)

def test_astype_no_pandas_dtype(self):
# https://github.com/pandas-dev/pandas/pull/24866
ser = pd.Series([1, 2], dtype="int64")
# Don't have PandasDtype in the public API, so we use `.array.dtype`,
# which is a PandasDtype.
result = ser.astype(ser.array.dtype)
tm.assert_series_equal(result, ser)

def test_from_array(self):
result = pd.Series(pd.array(['1H', '2H'], dtype='timedelta64[ns]'))
assert result._data.blocks[0].is_extension is False
Expand Down