fixed type errors in tests

Author: jhendricks487

doc/source/user_guide/timeseries.rst

@@ -1065,9 +1065,9 @@ Holiday calendars can be used to provide the list of holidays.  See the
 
 .. ipython:: python
 
-    from pandas.tseries.holiday import USFederalHolidayCalendar
+    calendar = np.busdaycalendar(holidays=['2014-01-01', '2014-01-20'])
 
-    bday_us = pd.offsets.CustomBusinessDay(calendar=USFederalHolidayCalendar())
+    bday_us = pd.offsets.CustomBusinessDay(calendar=calendar)
 
     # Friday before MLK Day
     dt = datetime.datetime(2014, 1, 17)
@@ -1080,7 +1080,8 @@ in the usual way.
 
 .. ipython:: python
 
-    bmth_us = pd.offsets.CustomBusinessMonthBegin(calendar=USFederalHolidayCalendar())
+    bdd = np.busdaycalendar(holidays=['2011-07-01', '2011-07-04', '2011-07-17'])
+    bmth_us = pd.offsets.CustomBusinessMonthBegin(calendar=bdd)
 
     # Skip new years
     dt = datetime.datetime(2013, 12, 17)
@@ -1210,9 +1211,9 @@ as ``BusinessHour`` except that it skips specified custom holidays.
 
 .. ipython:: python
 
-    from pandas.tseries.holiday import USFederalHolidayCalendar
+   calendar = np.busdaycalendar(holidays=['2014-01-01', '2014-01-20'])
 
-    bhour_us = pd.offsets.CustomBusinessHour(calendar=USFederalHolidayCalendar())
+    bhour_us = pd.offsets.CustomBusinessHour(calendar=calendar)
     # Friday before MLK Day
     dt = datetime.datetime(2014, 1, 17, 15)
 

pandas/_libs/tslibs/offsets.pyx

@@ -4827,6 +4827,11 @@ cdef class CustomBusinessHour(BusinessHour):
         offset=timedelta(0),
     ):
         BusinessHour.__init__(self, n, normalize, start=start, end=end, offset=offset)
+        if calendar is not None and not isinstance(calendar, np.busdaycalendar):
+            raise TypeError(
+                f"Only np.busdaycalendar is supported for calendar, "
+                f"got {type(calendar).__name__} instead"
+            )
         self._init_custom(weekmask, holidays, calendar)
 
 
@@ -4845,6 +4850,11 @@ cdef class _CustomBusinessMonth(BusinessMixin):
         offset=timedelta(0),
     ):
         BusinessMixin.__init__(self, n, normalize, offset)
+        if calendar is not None and not isinstance(calendar, np.busdaycalendar):
+            raise TypeError(
+                f"Only np.busdaycalendar is supported for calendar, "
+                f"got {type(calendar).__name__} instead"
+            )
         self._init_custom(weekmask, holidays, calendar)
 
     @cache_readonly

pandas/tests/tseries/holiday/test_calendar.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 
+import numpy as np
 import pytest
 
 from pandas import (
@@ -14,7 +15,6 @@
     Holiday,
     Timestamp,
     USFederalHolidayCalendar,
-    USLaborDay,
     USThanksgivingDay,
     get_calendar,
 )
@@ -97,10 +97,7 @@ def test_calendar_2031():
     # Labor Day 2031 is on September 1. Saturday before is August 30.
     # Next working day after August 30 ought to be Tuesday, September 2.
 
-    class testCalendar(AbstractHolidayCalendar):
-        rules = [USLaborDay]
-
-    cal = testCalendar()
+    cal = np.busdaycalendar(holidays=["2031-09-01"])
     workDay = offsets.CustomBusinessDay(calendar=cal)
     Sat_before_Labor_Day_2031 = to_datetime("2031-08-30")
     next_working_day = Sat_before_Labor_Day_2031 + 0 * workDay

pandas/tests/tseries/offsets/test_custom_business_day.py

@@ -22,8 +22,6 @@
 )
 from pandas.tests.tseries.offsets.common import assert_offset_equal
 
-from pandas.tseries.holiday import USFederalHolidayCalendar
-
 
 @pytest.fixture
 def offset():
@@ -82,7 +80,7 @@ def test_weekmask_and_holidays(self):
 
     @pytest.mark.filterwarnings("ignore:Non:pandas.errors.PerformanceWarning")
     def test_calendar(self):
-        calendar = USFederalHolidayCalendar()
+        calendar = np.busdaycalendar(holidays=["2014-01-01", "2014-01-20"])
         dt = datetime(2014, 1, 17)
         assert_offset_equal(CDay(calendar=calendar), dt, datetime(2014, 1, 21))
 

pandas/tests/tseries/offsets/test_custom_business_hour.py

@@ -21,8 +21,6 @@
 
 from pandas.tests.tseries.offsets.common import assert_offset_equal
 
-from pandas.tseries.holiday import USFederalHolidayCalendar
-
 holidays = ["2014-06-27", datetime(2014, 6, 30), np.datetime64("2014-07-02")]
 
 
@@ -299,7 +297,8 @@ def test_apply_nanoseconds(self, nano_case):
 
     def test_us_federal_holiday_with_datetime(self):
         # GH 16867
-        bhour_us = CustomBusinessHour(calendar=USFederalHolidayCalendar())
+        calendar = np.busdaycalendar(holidays=["2014-01-01", "2014-01-20"])
+        bhour_us = CustomBusinessHour(calendar=calendar)
         t0 = datetime(2014, 1, 17, 15)
         result = t0 + bhour_us * 8
         expected = Timestamp("2014-01-21 15:00:00")