Skip to content

CLN: replace unnecessary freq_to_period_freqstr with PeriodDtype constructor #56550

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 18 commits into from
Feb 28, 2024
Merged

CLN: replace unnecessary freq_to_period_freqstr with PeriodDtype constructor #56550

Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
bc53d16
replace freq_to_period_freqstr() with PeriodDtype(freq)._freqstr in _…
natmokval Dec 14, 2023
2a3d992
Merge branch 'main' into depr-correct-rename-M-to-ME-II
natmokval Dec 14, 2023
42fa6c4
Merge branch 'main' into depr-correct-rename-M-to-ME-II
natmokval Dec 15, 2023
4905c42
Merge branch 'main' into depr-correct-rename-M-to-ME-II
natmokval Dec 18, 2023
afcffbb
replace freq_to_period_freqstr with PeriodDtype()._freqstr except in …
natmokval Dec 19, 2023
6f9d974
fix pre-commit errors
natmokval Dec 19, 2023
5a4bdc5
Merge branch 'main' into depr-correct-rename-M-to-ME-II
natmokval Jan 25, 2024
e2c94f6
resolve conflict
natmokval Feb 7, 2024
602a71b
resolve conflict
natmokval Feb 8, 2024
b529965
remove freq_to_period_freqstr from _maybe_coerce_freq and from tests
natmokval Feb 10, 2024
daf707b
remove freq_to_period_freqstr from period.pyx
natmokval Feb 13, 2024
1b81967
Merge branch 'main' into depr-correct-rename-M-to-ME-II
natmokval Feb 13, 2024
b74807d
correct raise_on_incompatible
natmokval Feb 13, 2024
751ab49
correct raise_on_incompatible again
natmokval Feb 13, 2024
48292cd
replace warnings.simplefilter with warnings.filterwarnings in raise_o…
natmokval Feb 15, 2024
ec25560
remove regex splitting from test_line_plot_datetime_frame
natmokval Feb 21, 2024
a057a63
Merge branch 'main' into depr-correct-rename-M-to-ME-II
natmokval Feb 21, 2024
2131579
remove regex splitting from test_line_plot_period_mlt_frame
natmokval Feb 22, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pandas/core/generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
Timestamp,
to_offset,
)
from pandas._libs.tslibs.dtypes import freq_to_period_freqstr
from pandas._typing import (
AlignJoin,
AnyArrayLike,
Expand Down Expand Up @@ -135,6 +134,7 @@
from pandas.core.dtypes.dtypes import (
DatetimeTZDtype,
ExtensionDtype,
PeriodDtype,
)
from pandas.core.dtypes.generic import (
ABCDataFrame,
Expand Down Expand Up @@ -11274,9 +11274,9 @@ def _shift_with_freq(self, periods: int, axis: int, freq) -> Self:
if freq != orig_freq:
assert orig_freq is not None # for mypy
raise ValueError(
f"Given freq {freq_to_period_freqstr(freq.n, freq.name)} "
f"Given freq {PeriodDtype(freq)._freqstr} "
Copy link
Member

@MarcoGorelli MarcoGorelli Dec 19, 2023

Choose a reason for hiding this comment

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

does this change the message? if so, could you show before vs after please?

if not, then is it possible to do this replacement across the whole codebase and get rid of freq_to_period_freqstr?
Copy link
Contributor Author

@natmokval natmokval Dec 19, 2023

Choose a reason for hiding this comment

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

does this change the message? if so, could you show before vs after please?

It doesn't change the message.

if not, then is it possible to do this replacement across the whole codebase and get rid of freq_to_period_freqstr?

I replaced freq_to_period_freqstr with PeriodDtype(offset)._freqstr where it works. Now I am trying to do this replacement in pandas/tseries/frequencies.py and in pandas/_libs/tslibs/period.pyx, but I get failures. I am not sure we can complitely rid of freq_to_period_freqstr
f"does not match PeriodIndex freq "
f"{freq_to_period_freqstr(orig_freq.n, orig_freq.name)}"
f"{PeriodDtype(orig_freq)._freqstr}"
)
new_ax = index.shift(periods)
else:
Expand Down