holidays 0.25__py3-none-any.whl → 0.27__py3-none-any.whl

holidays/countries/canada.py

@@ -14,8 +14,7 @@ from datetime import timedelta as td
 from gettext import gettext as tr
 
 from holidays.calendars import _get_nth_weekday_from, _get_nth_weekday_of_month
-from holidays.constants import FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT
-from holidays.constants import SUN, MON
+from holidays.constants import FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, SUN, MON
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
@@ -38,6 +37,7 @@ class Canada(HolidayBase, ChristianHolidays, InternationalHolidays):
         "SK",
         "YT",
     )
+    supported_languages = ("ar", "en", "en_US", "fr", "th")
 
     def __init__(self, *args, **kwargs):
         # Default subdivision to ON; prov for backwards compatibility
@@ -52,17 +52,13 @@ class Canada(HolidayBase, ChristianHolidays, InternationalHolidays):
             1 if self._is_friday(dt) or self._is_weekend(dt) else -1, MON, dt
         )
 
-    def _add_observed(self, hol_date: date, include_sat: bool = True) -> None:
+    def _add_observed(self, dt: date, include_sat: bool = True, days: int = +1) -> None:
         if not self.observed:
             return None
-        if self._is_sunday(hol_date) or (
-            self._is_saturday(hol_date) and include_sat
-        ):
-            obs_date = _get_nth_weekday_from(1, MON, hol_date)
-            if obs_date in self:
-                obs_date += td(days=+1)
+        if self._is_sunday(dt) or (include_sat and self._is_saturday(dt)):
             self._add_holiday(
-                self.tr("%s (Observed)") % self[hol_date], obs_date
+                self.tr("%s (Observed)") % self[dt],
+                dt + td(days=+2 if self._is_saturday(dt) else days),
             )
 
     def _populate(self, year):
@@ -90,14 +86,17 @@ class Canada(HolidayBase, ChristianHolidays, InternationalHolidays):
                 _get_nth_weekday_of_month(1, MON, SEP, self._year),
             )
 
-        # Christmas Day.
-        dec_25 = self._add_christmas_day(tr("Christmas Day"))
-
-        # Boxing Day.
-        dec_26 = self._add_christmas_day_two(tr("Boxing Day"))
+        self._add_observed(
+            # Christmas Day.
+            self._add_christmas_day(tr("Christmas Day")),
+            days=+2,
+        )
 
-        self._add_observed(dec_25)
-        self._add_observed(dec_26)
+        self._add_observed(
+            # Boxing Day.
+            self._add_christmas_day_two(tr("Boxing Day")),
+            days=+2,
+        )
 
     def _add_family_day(self):
         self._add_holiday(
@@ -171,9 +170,7 @@ class Canada(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     def _add_subdiv_bc_holidays(self):
         if self._year >= 2013:
-            dt = _get_nth_weekday_of_month(
-                3 if self._year >= 2019 else 2, MON, FEB, self._year
-            )
+            dt = _get_nth_weekday_of_month(3 if self._year >= 2019 else 2, MON, FEB, self._year)
             self._add_holiday(tr("Family Day"), dt)
 
         if self._year >= 1953:
@@ -226,9 +223,7 @@ class Canada(HolidayBase, ChristianHolidays, InternationalHolidays):
                 # Civic Holiday.
                 else tr("Civic Holiday")
             )
-            self._add_holiday(
-                name, _get_nth_weekday_of_month(1, MON, AUG, self._year)
-            )
+            self._add_holiday(name, _get_nth_weekday_of_month(1, MON, AUG, self._year))
 
         if self._year >= 2021:
             self._add_holiday(
@@ -396,9 +391,7 @@ class Canada(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     def _add_subdiv_pe_holidays(self):
         if self._year >= 2009:
-            dt = _get_nth_weekday_of_month(
-                3 if self._year >= 2010 else 2, MON, FEB, self._year
-            )
+            dt = _get_nth_weekday_of_month(3 if self._year >= 2010 else 2, MON, FEB, self._year)
             # Islander Day.
             self._add_holiday(tr("Islander Day"), dt)
 
@@ -464,8 +457,7 @@ class Canada(HolidayBase, ChristianHolidays, InternationalHolidays):
         if self._year >= 1974:
             self._add_holiday(
                 tr("Heritage Day"),
-                _get_nth_weekday_of_month(-1, SUN, FEB, self._year)
-                + td(days=-2),
+                _get_nth_weekday_of_month(-1, SUN, FEB, self._year) + td(days=-2),
             )
 
         if self._year >= 1953:

holidays/countries/chad.py

@@ -0,0 +1,133 @@
+#  python-holidays
+#  ---------------
+#  A fast, efficient Python library for generating country, province and state
+#  specific sets of holidays on the fly. It aims to make determining whether a
+#  specific date is a holiday as fast and flexible as possible.
+#
+#  Authors: dr-prodigy <dr.prodigy.github@gmail.com> (c) 2017-2023
+#           ryanss <ryanssdev@icloud.com> (c) 2014-2017
+#  Website: https://github.com/dr-prodigy/python-holidays
+#  License: MIT (see LICENSE file)
+
+from datetime import date
+from datetime import timedelta as td
+
+from holidays.calendars import _CustomIslamicCalendar
+from holidays.constants import JAN, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
+from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays, IslamicHolidays
+
+
+class Chad(HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays):
+    """
+    References:
+      - https://en.wikipedia.org/wiki/Public_holidays_in_Chad
+      - https://www.ilo.org/dyn/natlex/docs/ELECTRONIC/97323/115433/F-316075167/TCD-97323.pdf  # noqa: E501
+    """
+
+    country = "TD"
+    special_holidays = {
+        2021: (APR, 23, "Funeral of Idriss Déby Itno"),
+    }
+
+    def __init__(self, *args, **kwargs) -> None:
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        IslamicHolidays.__init__(self, calendar=ChadIslamicCalendar())
+        super().__init__(*args, **kwargs)
+
+    def _add_observed(self, dt: date) -> None:
+        if self.observed and self._is_sunday(dt):
+            self._add_holiday("%s (Observed)" % self[dt], dt + td(days=+1))
+
+    def _populate(self, year):
+        # On 11 August 1960, Chad gained independence from France.
+        if year <= 1960:
+            return None
+
+        super()._populate(year)
+
+        # New Year's Day.
+        self._add_observed(self._add_new_years_day("New Year's Day"))
+
+        # International Women's Day.
+        self._add_observed(self._add_womens_day("International Women's Day"))
+
+        # Easter Monday.
+        self._add_easter_monday("Easter Monday")
+
+        # Labour Day.
+        self._add_observed(self._add_labor_day("Labour Day"))
+
+        # Independence Day.
+        self._add_observed(self._add_holiday("Independence Day", AUG, 11))
+
+        # All Saints' Day.
+        self._add_all_saints_day("All Saints' Day")
+
+        self._add_observed(
+            # Republic Day.
+            self._add_holiday("Republic Day", NOV, 28)
+        )
+
+        if year >= 1991:
+            self._add_observed(
+                # Freedom and Democracy Day.
+                self._add_holiday("Freedom and Democracy Day", DEC, 1)
+            )
+
+        # Christmas Day.
+        self._add_christmas_day("Christmas Day")
+
+        # Eid al-Fitr.
+        self._add_eid_al_fitr_day("Eid al-Fitr")
+
+        # Eid al-Adha.
+        self._add_eid_al_adha_day("Eid al-Adha")
+
+        # Mawlid.
+        self._add_mawlid_day("Mawlid")
+
+
+class TD(Chad):
+    pass
+
+
+class TCD(Chad):
+    pass
+
+
+class ChadIslamicCalendar(_CustomIslamicCalendar):
+    EID_AL_ADHA_DATES = {
+        2015: (SEP, 24),
+        2016: (SEP, 13),
+        2017: (SEP, 2),
+        2018: (AUG, 22),
+        2019: (AUG, 11),
+        2020: (JUL, 31),
+        2021: (JUL, 20),
+        2022: (JUL, 9),
+    }
+
+    EID_AL_FITR_DATES = {
+        2015: (JUL, 18),
+        2016: (JUL, 7),
+        2017: (JUN, 26),
+        2018: (JUN, 15),
+        2019: (JUN, 4),
+        2020: (MAY, 24),
+        2021: (MAY, 13),
+        2022: (MAY, 2),
+        2023: (APR, 21),
+    }
+
+    MAWLID_DATES = {
+        2015: ((JAN, 3), (DEC, 24)),
+        2016: (DEC, 12),
+        2017: (DEC, 1),
+        2018: (NOV, 21),
+        2019: (NOV, 9),
+        2020: (OCT, 29),
+        2021: (OCT, 18),
+        2022: (OCT, 8),
+    }

holidays/countries/chile.py

@@ -28,11 +28,10 @@ class Chile(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
 
     country = "CL"
+    default_language = "es"
     special_holidays = {
-        2022: ((SEP, 16, tr("Feriado nacional")),),
+        2022: (SEP, 16, tr("Feriado nacional")),
     }
-    default_language = "es"
-    # ISO 3166-2 codes for the principal subdivisions, called regions
     subdivisions = (
         "AI",
         "AN",
@@ -51,6 +50,7 @@ class Chile(HolidayBase, ChristianHolidays, InternationalHolidays):
         "TA",
         "VS",
     )
+    supported_languages = ("en_US", "es", "uk")
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
@@ -113,9 +113,7 @@ class Chile(HolidayBase, ChristianHolidays, InternationalHolidays):
 
         # Saint Peter and Saint Paul (Law 16.840, Law 18.432)
         if year <= 1967 or year >= 1986:
-            self._add_holiday(
-                tr("San Pedro y San Pablo"), _get_movable(date(year, JUN, 29))
-            )
+            self._add_holiday(tr("San Pedro y San Pablo"), _get_movable(date(year, JUN, 29)))
 
         # Day of Virgin of Carmen (Law 20.148)
         if year >= 2007:
@@ -160,9 +158,7 @@ class Chile(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Columbus day (Law 3.810).
         if year >= 1922 and year != 1973:
             self._add_holiday(
-                tr("Día del Encuentro de dos Mundos")
-                if year >= 2000
-                else tr("Día de la Raza"),
+                tr("Día del Encuentro de dos Mundos") if year >= 2000 else tr("Día de la Raza"),
                 _get_movable(date(year, OCT, 12)),
             )
 
@@ -205,10 +201,7 @@ class Chile(HolidayBase, ChristianHolidays, InternationalHolidays):
         if self._year >= 2014:
             # Región de Ñuble
             self._add_holiday(
-                tr(
-                    "Nacimiento del Prócer de la Independencia "
-                    "(Chillán y Chillán Viejo)"
-                ),
+                tr("Nacimiento del Prócer de la Independencia (Chillán y Chillán Viejo)"),
                 AUG,
                 20,
             )

holidays/countries/china.py

@@ -9,60 +9,56 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import date
 from datetime import timedelta as td
 
-from holidays.calendars import _ChineseLuniSolar
-from holidays.constants import JAN, APR, MAY, OCT
+from holidays.constants import OCT
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChineseCalendarHolidays, InternationalHolidays
 
 
-class China(HolidayBase):
+class China(HolidayBase, ChineseCalendarHolidays, InternationalHolidays):
     """
     https://en.wikipedia.org/wiki/Public_holidays_in_China
     """
 
     country = "CN"
 
-    def __init__(self, **kwargs):
-        self.cnls = _ChineseLuniSolar()
-        HolidayBase.__init__(self, **kwargs)
+    def __init__(self, *args, **kwargs):
+        ChineseCalendarHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
 
     def _populate(self, year):
         if year <= 1949:
             return None
-
         super()._populate(year)
 
-        self[date(year, JAN, 1)] = "New Year's Day"
+        self._add_new_years_day("New Year's Day")
 
         name = "Labour Day"
-        dt = date(year, MAY, 1)
-        self[dt] = name
+        may_1 = self._add_labor_day(name)
         if 2000 <= year <= 2007:
-            self[dt + td(days=+1)] = name
-            self[dt + td(days=+2)] = name
+            self._add_holiday(name, may_1 + td(days=+1))
+            self._add_holiday(name, may_1 + td(days=+2))
 
         name = "Chinese New Year (Spring Festival)"
-        dt = self.cnls.lunar_n_y_date(year)
-        self[dt] = name
-        self[dt + td(days=+1)] = name
+        self._add_chinese_new_years_day(name)
+        self._add_chinese_new_years_day_two(name)
         if 2008 <= year <= 2013:
-            self[dt + td(days=-1)] = name
+            self._add_chinese_new_years_eve(name)
         else:
-            self[dt + td(days=+2)] = name
+            self._add_chinese_new_years_day_three(name)
 
         name = "National Day"
-        dt = date(year, OCT, 1)
-        self[dt] = name
-        self[dt + td(days=+1)] = name
+        self._add_holiday(name, OCT, 1)
+        self._add_holiday(name, OCT, 2)
         if year >= 2000:
-            self[dt + td(days=+2)] = name
+            self._add_holiday(name, OCT, 3)
 
         if year >= 2008:
-            self[date(year, APR, 5)] = "Tomb-Sweeping Day"
-            self[self.cnls.lunar_to_gre(year, 5, 5)] = "Dragon Boat Festival"
-            self[self.cnls.lunar_to_gre(year, 8, 15)] = "Mid-Autumn Festival"
+            self._add_qingming_festival("Tomb-Sweeping Day")
+            self._add_dragon_boat_festival("Dragon Boat Festival")
+            self._add_mid_autumn_festival("Mid-Autumn Festival")
 
 
 class CN(China):

holidays/countries/colombia.py

@@ -13,14 +13,13 @@ from datetime import date
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from dateutil.easter import easter
-
 from holidays.calendars import _get_nth_weekday_from
-from holidays.constants import JAN, MAR, MAY, JUN, JUL, AUG, OCT, NOV, DEC, MON
+from holidays.constants import JAN, MAR, JUN, JUL, AUG, OCT, NOV, MON
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Colombia(HolidayBase):
+class Colombia(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     Colombia has 18 holidays. The establishing of these are by:
     Ley 35 de 1939 (DEC 4): https://bit.ly/3PJwk7B
@@ -31,6 +30,12 @@ class Colombia(HolidayBase):
 
     country = "CO"
     default_language = "es"
+    supported_languages = ("en_US", "es", "uk")
+
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
 
     def _add_with_bridge(self, dt: date, name: str) -> None:
         """
@@ -60,7 +65,7 @@ class Colombia(HolidayBase):
         super()._populate(year)
 
         # New Year's Day
-        self._add_holiday(tr("Año Nuevo"), JAN, 1)
+        self._add_new_years_day(tr("Año Nuevo"))
 
         if year >= 1951:
             # Epiphany
@@ -76,7 +81,7 @@ class Colombia(HolidayBase):
             )
 
         # Labor Day
-        self[date(year, MAY, 1)] = tr("Día del Trabajo")
+        self._add_labor_day(tr("Día del Trabajo"))
 
         if year >= 1951:
             # Saint Peter and Saint Paul's Day
@@ -119,36 +124,34 @@ class Colombia(HolidayBase):
 
         if year >= 1951:
             # Immaculate Conception
-            self._add_holiday(tr("La Inmaculada Concepción"), DEC, 8)
+            self._add_immaculate_conception_day(tr("La Inmaculada Concepción"))
 
         # Christmas
-        self._add_holiday(tr("Navidad"), DEC, 25)
-
-        easter_date = easter(year)
+        self._add_christmas_day(tr("Navidad"))
 
         if year >= 1951:
             # Maundy Thursday
-            self._add_holiday(tr("Jueves Santo"), easter_date + td(days=-3))
+            self._add_holy_thursday(tr("Jueves Santo"))
 
             # Good Friday
-            self._add_holiday(tr("Viernes Santo"), easter_date + td(days=-2))
+            self._add_good_friday(tr("Viernes Santo"))
 
             # Ascension of Jesus
             self._add_with_bridge(
-                easter_date + td(days=+39),
+                self._easter_sunday + td(days=+39),
                 tr("Ascensión del señor"),
             )
 
             # Corpus Christi
             self._add_with_bridge(
-                easter_date + td(days=+60),
+                self._easter_sunday + td(days=+60),
                 tr("Corpus Christi"),
             )
 
         if year >= 1984:
             # Sacred Heart
             self._add_with_bridge(
-                easter_date + td(days=+68),
+                self._easter_sunday + td(days=+68),
                 tr("Sagrado Corazón"),
             )
 

holidays/countries/costa_rica.py

@@ -26,6 +26,7 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "CR"
     default_language = "es"
+    supported_languages = ("en_US", "es", "uk")
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
@@ -33,25 +34,24 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
         super().__init__(*args, **kwargs)
 
     def _populate(self, year):
-        def _add_movable(hol_name: str, hol_date: date) -> None:
+        def add_movable_holiday(name: str, dt: date) -> None:
             # Law #9875 from 16.07.2020
             if self.observed:
-                if not self._is_monday(hol_date):
-                    hol_name = self.tr("%s (Observado)") % self.tr(hol_name)
-                if self._is_tuesday(hol_date) or self._is_wednesday(hol_date):
-                    hol_date = _get_nth_weekday_from(-1, MON, hol_date)
+                if not self._is_monday(dt):
+                    name = self.tr("%s (Observado)") % self.tr(name)
+
+                if self._is_tuesday(dt) or self._is_wednesday(dt):
+                    dt = _get_nth_weekday_from(-1, MON, dt)
                 else:
-                    hol_date = _get_nth_weekday_from(1, MON, hol_date)
-            self._add_holiday(hol_name, hol_date)
+                    dt = _get_nth_weekday_from(1, MON, dt)
+            self._add_holiday(name, dt)
 
-        def _add_observed(hol_name: str, hol_date: date) -> None:
+        def add_observed_holiday(name: str, dt: date) -> None:
             if self.observed:
-                if not (
-                    self._is_monday(hol_date) or self._is_weekend(hol_date)
-                ):
-                    hol_date = _get_nth_weekday_from(1, MON, hol_date)
-                    hol_name = self.tr("%s (Observado)") % self.tr(hol_name)
-            self._add_holiday(hol_name, hol_date)
+                if not (self._is_monday(dt) or self._is_weekend(dt)):
+                    dt = _get_nth_weekday_from(1, MON, dt)
+                    name = self.tr("%s (Observado)") % self.tr(name)
+            self._add_holiday(name, dt)
 
         super()._populate(year)
 
@@ -70,16 +70,16 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Juan Santamaría Day.
         name = tr("Día de Juan Santamaría")
         if 2006 <= year <= 2010:
-            _add_observed(name, dt)
+            add_observed_holiday(name, dt)
         elif year in {2023, 2024}:
-            _add_movable(name, dt)
+            add_movable_holiday(name, dt)
         else:
             self._add_holiday(name, dt)
 
         # International Labor Day.
         name = tr("Día Internacional del Trabajo")
         if year == 2021:
-            _add_movable(name, date(year, MAY, 1))
+            add_movable_holiday(name, date(year, MAY, 1))
         else:
             self._add_labor_day(name)
 
@@ -89,9 +89,9 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Annexation of the Party of Nicoya to Costa Rica.
         name = tr("Anexión del Partido de Nicoya a Costa Rica")
         if 2005 <= year <= 2008:
-            _add_observed(name, dt)
+            add_observed_holiday(name, dt)
         elif 2020 <= year <= 2024:
-            _add_movable(name, dt)
+            add_movable_holiday(name, dt)
         else:
             self._add_holiday(name, dt)
 
@@ -108,9 +108,9 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Mother's Day.
         name = tr("Día de la Madre")
         if 2005 <= year <= 2007:
-            _add_observed(name, dt)
+            add_observed_holiday(name, dt)
         elif year in {2020, 2023, 2024}:
-            _add_movable(name, dt)
+            add_movable_holiday(name, dt)
         else:
             self._add_holiday(name, dt)
 
@@ -118,9 +118,7 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
         if year >= 2022:
             dt = date(year, AUG, 31)
             # Day of the Black Person and Afro-Costa Rican Culture.
-            name = self.tr(
-                "Día de la Persona Negra y la Cultura Afrocostarricense"
-            )
+            name = self.tr("Día de la Persona Negra y la Cultura Afrocostarricense")
             if self.observed and year in {2022, 2023}:
                 dt = _get_nth_weekday_from(1, SUN, dt)
                 name = self.tr("%s (Observado)") % name
@@ -130,14 +128,14 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Independence Day.
         name = tr("Día de la Independencia")
         if year in {2020, 2021, 2022, 2024}:
-            _add_movable(name, dt)
+            add_movable_holiday(name, dt)
         else:
             self._add_holiday(name, dt)
 
         # Law #9803 from 19.05.2020
         if year <= 2019:
             # Cultures Day.
-            _add_observed(tr("Día de las Culturas"), date(year, OCT, 12))
+            add_observed_holiday(tr("Día de las Culturas"), date(year, OCT, 12))
 
         # Law #9803 from 19.05.2020
         if year >= 2020:
@@ -145,7 +143,7 @@ class CostaRica(HolidayBase, ChristianHolidays, InternationalHolidays):
             # Army Abolition Day.
             name = tr("Día de la Abolición del Ejército")
             if year in {2020, 2021, 2022}:
-                _add_movable(name, dt)
+                add_movable_holiday(name, dt)
             else:
                 self._add_holiday(name, dt)
 

holidays/countries/cuba.py

@@ -13,13 +13,12 @@ from datetime import date
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from dateutil.easter import easter
-
-from holidays.constants import JAN, MAY, JUL, OCT, DEC
+from holidays.constants import JAN, JUL, OCT
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Cuba(HolidayBase):
+class Cuba(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     Overview: https://en.wikipedia.org/wiki/Public_holidays_in_Cuba
     1984 (DEC 28): https://bit.ly/3okNBbt
@@ -36,8 +35,18 @@ class Cuba(HolidayBase):
 
     country = "CU"
     default_language = "es"
+    supported_languages = ("en_US", "es", "uk")
+
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
 
     def _populate(self, year):
+        # This calendar only works from 1959 onwards.
+        if year <= 1958:
+            return None
+
         def _add_observed(hol_date: date) -> None:
             if self.observed and self._is_sunday(hol_date):
                 self._add_holiday(
@@ -63,12 +72,12 @@ class Cuba(HolidayBase):
         # Permanently granted in 2013 decree for 2014 and onwards.
         if year >= 2012:
             # Good Friday.
-            self._add_holiday(tr("Viernes Santo"), easter(year) + td(days=-2))
+            self._add_good_friday(tr("Viernes Santo"))
 
-        # Labour Day.
-        dt = date(year, MAY, 1)
-        self._add_holiday(tr("Día Internacional de los Trabajadores"), dt)
-        _add_observed(dt)
+        _add_observed(
+            # Labour Day.
+            self._add_labor_day(tr("Día Internacional de los Trabajadores"))
+        )
 
         # Commemoration of the Assault of the Moncada garrison.
         self._add_holiday(tr("Conmemoración del asalto a Moncada"), JUL, 25)
@@ -79,10 +88,14 @@ class Cuba(HolidayBase):
         # Commemoration of the Assault of the Moncada garrison.
         self._add_holiday(tr("Conmemoración del asalto a Moncada"), JUL, 27)
 
-        dt = date(year, OCT, 10)
-        # Independence Day.
-        self._add_holiday(tr("Inicio de las Guerras de Independencia"), dt)
-        _add_observed(dt)
+        _add_observed(
+            self._add_holiday(
+                # Independence Day.
+                tr("Inicio de las Guerras de Independencia"),
+                OCT,
+                10,
+            )
+        )
 
         # In 1969, Christmas was cancelled for the sugar harvest but then was
         # cancelled for good:
@@ -94,12 +107,12 @@ class Cuba(HolidayBase):
         #   https://bit.ly/3cyXj7F
         if year <= 1968 or year >= 1997:
             # Christmas Day.
-            self._add_holiday(tr("Día de Navidad"), DEC, 25)
+            self._add_christmas_day(tr("Día de Navidad"))
 
         # Granted in 2007 decree.
         if year >= 2007:
             # New Year's Eve.
-            self._add_holiday(tr("Fiesta de Fin de Año"), DEC, 31)
+            self._add_new_years_eve(tr("Fiesta de Fin de Año"))
 
 
 class CU(Cuba):