Skip to content

Commit efb572e

Browse files
committed
CLN: change typing for TimestampConvertibleTypes
1 parent 343a30a commit efb572e

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

pandas/_typing.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
PandasScalar = Union["Period", "Timestamp", "Timedelta", "Interval"]
4545
Scalar = Union[PythonScalar, PandasScalar]
4646

47-
# timestamp and timedelta compatible types
47+
# timestamp and timedelta convertible types
4848

49-
TimestampCompatibleTypes = Union[
49+
TimestampConvertibleTypes = Union[
5050
"Timestamp", datetime, np.datetime64, int, np.int64, float, str
5151
]
52-
TimedeltaCompatibleTypes = Union[
52+
TimedeltaConvertibleTypes = Union[
5353
"Timedelta", timedelta, np.timedelta64, int, np.int64, float, str
5454
]
5555

pandas/core/generic.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
Label,
4040
Level,
4141
Renamer,
42-
TimedeltaCompatibleTypes,
43-
TimestampCompatibleTypes,
42+
TimedeltaConvertibleTypes,
43+
TimestampConvertibleTypes,
4444
ValueKeyFunc,
4545
)
4646
from pandas.compat import set_function_name
@@ -7765,8 +7765,8 @@ def resample(
77657765
base: Optional[int] = None,
77667766
on=None,
77677767
level=None,
7768-
origin: Union[str, TimestampCompatibleTypes] = "start_day",
7769-
offset: Optional[TimedeltaCompatibleTypes] = None,
7768+
origin: Union[str, TimestampConvertibleTypes] = "start_day",
7769+
offset: Optional[TimedeltaConvertibleTypes] = None,
77707770
) -> "Resampler":
77717771
"""
77727772
Resample time-series data.

pandas/core/resample.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from pandas._libs.tslibs import NaT, Period, Timedelta, Timestamp
1010
from pandas._libs.tslibs.frequencies import is_subperiod, is_superperiod
1111
from pandas._libs.tslibs.period import IncompatibleFrequency
12-
from pandas._typing import TimedeltaCompatibleTypes, TimestampCompatibleTypes
12+
from pandas._typing import TimedeltaConvertibleTypes, TimestampConvertibleTypes
1313
from pandas.compat.numpy import function as nv
1414
from pandas.errors import AbstractMethodError
1515
from pandas.util._decorators import Appender, Substitution, doc
@@ -1317,8 +1317,8 @@ def __init__(
13171317
kind: Optional[str] = None,
13181318
convention: Optional[str] = None,
13191319
base: Optional[int] = None,
1320-
origin: Union[str, TimestampCompatibleTypes] = "start_day",
1321-
offset: Optional[TimedeltaCompatibleTypes] = None,
1320+
origin: Union[str, TimestampConvertibleTypes] = "start_day",
1321+
offset: Optional[TimedeltaConvertibleTypes] = None,
13221322
**kwargs,
13231323
):
13241324
# Check for correctness of the keyword arguments which would

0 commit comments

Comments
 (0)