Skip to content

REF: avoid using internals methods for to_timestamp, to_period #32347

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 4 commits into from
Mar 4, 2020
Merged

REF: avoid using internals methods for to_timestamp, to_period #32347

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e1147c7
REF: avoid using internals methods for to_timestamp, to_period
jbrockmendel Feb 29, 2020
76a785b
Merge branch 'master' of https://github.com/pandas-dev/pandas into se…
jbrockmendel Mar 2, 2020
90ea457
simplify, annotate
jbrockmendel Mar 2, 2020
a5a2d4a
revert docstring
jbrockmendel Mar 2, 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
48 changes: 17 additions & 31 deletions pandas/core/frame.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,8 @@
)
from pandas.core.dtypes.generic import (
ABCDataFrame,
ABCDatetimeIndex,
ABCIndexClass,
ABCMultiIndex,
ABCPeriodIndex,
ABCSeries,
)
from pandas.core.dtypes.missing import isna, notna
Expand Down Expand Up @@ -8245,7 +8243,9 @@ def quantile(self, q=0.5, axis=0, numeric_only=True, interpolation="linear"):

return result

def to_timestamp(self, freq=None, how="start", axis=0, copy=True) -> "DataFrame":
def to_timestamp(
self, freq=None, how: str = "start", axis: Axis = 0, copy: bool = True
) -> "DataFrame":
"""
Cast to DatetimeIndex of timestamps, at *beginning* of period.

Expand All @@ -8265,23 +8265,16 @@ def to_timestamp(self, freq=None, how="start", axis=0, copy=True) -> "DataFrame"
-------
DataFrame with DatetimeIndex
"""
new_data = self._data
if copy:
new_data = new_data.copy()
new_obj = self.copy(deep=copy)

axis = self._get_axis_number(axis)
if axis == 0:
assert isinstance(self.index, (ABCDatetimeIndex, ABCPeriodIndex))
new_data.set_axis(1, self.index.to_timestamp(freq=freq, how=how))
elif axis == 1:
assert isinstance(self.columns, (ABCDatetimeIndex, ABCPeriodIndex))
new_data.set_axis(0, self.columns.to_timestamp(freq=freq, how=how))
else: # pragma: no cover
raise AssertionError(f"Axis must be 0 or 1. Got {axis}")
axis_name = self._get_axis_name(axis)
old_ax = getattr(self, axis_name)
new_ax = old_ax.to_timestamp(freq=freq, how=how)

return self._constructor(new_data)
setattr(new_obj, axis_name, new_ax)
Copy link
Member

Choose a reason for hiding this comment

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

could use set_axis(..., axis=) instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

either way works

return new_obj

def to_period(self, freq=None, axis=0, copy=True) -> "DataFrame":
def to_period(self, freq=None, axis: Axis = 0, copy: bool = True) -> "DataFrame":
"""
Convert DataFrame from DatetimeIndex to PeriodIndex.

Expand All @@ -8299,23 +8292,16 @@ def to_period(self, freq=None, axis=0, copy=True) -> "DataFrame":

Returns
-------
TimeSeries with PeriodIndex
DataFrame with PeriodIndex
"""
new_data = self._data
if copy:
new_data = new_data.copy()
new_obj = self.copy(deep=copy)

axis = self._get_axis_number(axis)
if axis == 0:
assert isinstance(self.index, ABCDatetimeIndex)
new_data.set_axis(1, self.index.to_period(freq=freq))
elif axis == 1:
assert isinstance(self.columns, ABCDatetimeIndex)
new_data.set_axis(0, self.columns.to_period(freq=freq))
else: # pragma: no cover
raise AssertionError(f"Axis must be 0 or 1. Got {axis}")
axis_name = self._get_axis_name(axis)
old_ax = getattr(self, axis_name)
new_ax = old_ax.to_period(freq=freq)

return self._constructor(new_data)
setattr(new_obj, axis_name, new_ax)
return new_obj

def isin(self, values) -> "DataFrame":
"""
Expand Down