Fix types

pydata · Sep 3, 2024 · 0d37fdd · 0d37fdd
1 parent d636784
commit 0d37fdd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/xarray/core/common.py b/xarray/core/common.py
@@ -1059,7 +1059,6 @@ def _resample(
         """
         # TODO support non-string indexer after removing the old API.
 
-        from xarray.coding.cftime_offsets import BaseCFTimeOffset
         from xarray.core.dataarray import DataArray
         from xarray.core.groupby import ResolvedGrouper
         from xarray.core.resample import RESAMPLE_DIM
@@ -1078,14 +1077,7 @@ def _resample(
         )
 
         grouper: Resampler
-        if isinstance(
-            freq,
-            str
-            | datetime.timedelta
-            | pd.Timedelta
-            | pd.offsets.BaseOffset
-            | BaseCFTimeOffset,
-        ):
+        if isinstance(freq, str | datetime.timedelta | pd.Timedelta | pd.DateOffset):
             grouper = TimeResampler(
                 freq=freq, closed=closed, label=label, origin=origin, offset=offset
             )
@@ -1094,8 +1086,8 @@ def _resample(
         else:
             raise ValueError(
                 "freq must be an object of type 'str', 'datetime.timedelta', "
-                "'pandas.Timedelta', 'pandas.offsets.BaseOffset', 'BaseCFTimeOffset', "
-                f" or 'TimeResampler'. Received {type(freq)} instead."
+                "'pandas.Timedelta', 'pandas.DateOffset', or 'TimeResampler'. "
+                f"Received {type(freq)} instead."
             )
 
         rgrouper = ResolvedGrouper(grouper, group, self)

diff --git a/xarray/groupers.py b/xarray/groupers.py
@@ -336,7 +336,7 @@ class TimeResampler(Resampler):
 
     Attributes
     ----------
-    freq : str, pandas.Timestamp, pandas.BaseOffset, datetime.timedelta, BaseCFTimeOffset
+    freq : str, datetime.timedelta, pandas.Timestamp, pandas.DateOffset
         Frequency to resample to. See `Pandas frequency
         aliases <https://pandas.pydata.org/pandas-docs/stable/user_guide/timeseries.html#offset-aliases>`_
         for a list of possible values.
@@ -358,7 +358,7 @@ class TimeResampler(Resampler):
         An offset timedelta added to the origin.
     """
 
-    freq: str | pd.Timedelta | pd.offsets.BaseOffset | datetime.timedelta
+    freq: str | datetime.timedelta | pd.Timedelta | pd.DateOffset
     closed: SideOptions | None = field(default=None)
     label: SideOptions | None = field(default=None)
     origin: str | DatetimeLike = field(default="start_day")