-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
CLN: Remove Series._from_array #19893
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.
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
Changes from 6 commits
ae676b8
0c67e5a
3d6a4dd
e27554c
c643922
545de1e
f000fdb
356b02b
e4ec987
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -101,6 +101,18 @@ def _get_frame_result_type(result, objs): | |
ABCSparseDataFrame)) | ||
|
||
|
||
def _get_sliced_frame_result_type(data, obj): | ||
""" | ||
return appropriate class of Series depending on whether | ||
the data is sparse or not. | ||
""" | ||
if is_sparse(data): | ||
from pandas.core.sparse.api import SparseSeries | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. from pandas import There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. from pandas import SparseSeries |
||
return SparseSeries | ||
else: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. just return, no else needed |
||
return obj._constructor_sliced | ||
|
||
|
||
def _concat_compat(to_concat, axis=0): | ||
""" | ||
provide concatenation of an array of arrays each of which is a single | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2166,8 +2166,7 @@ def _ixs(self, i, axis=0): | |
|
||
if index_len and not len(values): | ||
values = np.array([np.nan] * index_len, dtype=object) | ||
result = self._constructor_sliced._from_array( | ||
values, index=self.index, name=label, fastpath=True) | ||
result = self._box_col_values(values, label) | ||
|
||
# this is a cached value, mark it so | ||
result._set_as_cached(label, self) | ||
|
@@ -2563,8 +2562,10 @@ def _box_item_values(self, key, values): | |
|
||
def _box_col_values(self, values, items): | ||
""" provide boxed values for a column """ | ||
return self._constructor_sliced._from_array(values, index=self.index, | ||
name=items, fastpath=True) | ||
from pandas.core.dtypes.concat import _get_sliced_frame_result_type | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this can be imported at the top |
||
this_constructor_sliced = _get_sliced_frame_result_type(values, self) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. call this |
||
return this_constructor_sliced(values, index=self.index, | ||
name=items, fastpath=True) | ||
|
||
def __setitem__(self, key, value): | ||
key = com._apply_if_callable(key, self) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add a full doc-string