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

holidays/countries/israel.py

@@ -36,15 +36,11 @@ class Israel(HolidayBase):
         passover_dt = _HebrewLunisolar.hebrew_holiday_date(year, "PASSOVER")
         self._add_with_eve("Passover I", passover_dt)
         for offset in range(1, 5):
-            self._add_holiday(
-                "Passover - Chol HaMoed", passover_dt + td(days=offset)
-            )
+            self._add_holiday("Passover - Chol HaMoed", passover_dt + td(days=offset))
         self._add_with_eve("Passover VII", passover_dt + td(days=+6))
 
         # Memorial Day
-        memorial_day_dt = _HebrewLunisolar.hebrew_holiday_date(
-            year, "MEMORIAL_DAY"
-        )
+        memorial_day_dt = _HebrewLunisolar.hebrew_holiday_date(year, "MEMORIAL_DAY")
         observed_delta = 0
         if self.observed:
             if self._is_thursday(memorial_day_dt):
@@ -74,9 +70,7 @@ class Israel(HolidayBase):
             self._add_holiday(name, memorial_day_dt + td(days=+1))
 
         # Lag Baomer
-        lag_baomer_dt = _HebrewLunisolar.hebrew_holiday_date(
-            year, "LAG_BAOMER"
-        )
+        lag_baomer_dt = _HebrewLunisolar.hebrew_holiday_date(year, "LAG_BAOMER")
         self._add_holiday("Lag B'Omer", lag_baomer_dt)
 
         # Shavuot
@@ -84,26 +78,20 @@ class Israel(HolidayBase):
         self._add_with_eve("Shavuot", shavuot_dt)
 
         # Rosh Hashana
-        rosh_hashanah_dt = _HebrewLunisolar.hebrew_holiday_date(
-            year, "ROSH_HASHANAH"
-        )
+        rosh_hashanah_dt = _HebrewLunisolar.hebrew_holiday_date(year, "ROSH_HASHANAH")
         name = "Rosh Hashanah"
         self._add_with_eve(name, rosh_hashanah_dt)
         self._add_holiday(name, rosh_hashanah_dt + td(days=+1))
 
         # Yom Kippur
-        yom_kippur_dt = _HebrewLunisolar.hebrew_holiday_date(
-            year, "YOM_KIPPUR"
-        )
+        yom_kippur_dt = _HebrewLunisolar.hebrew_holiday_date(year, "YOM_KIPPUR")
         self._add_with_eve("Yom Kippur", yom_kippur_dt)
 
         # Sukkot
         sukkot_dt = _HebrewLunisolar.hebrew_holiday_date(year, "SUKKOT")
         self._add_with_eve("Sukkot I", sukkot_dt)
         for offset in range(1, 6):
-            self._add_holiday(
-                "Sukkot - Chol HaMoed", sukkot_dt + td(days=offset)
-            )
+            self._add_holiday("Sukkot - Chol HaMoed", sukkot_dt + td(days=offset))
         self._add_with_eve("Sukkot VII", sukkot_dt + td(days=+7))
 
         # Hanukkah

holidays/countries/italy.py

@@ -13,8 +13,7 @@
 from datetime import timedelta as td
 
 from holidays.calendars import _get_nth_weekday_of_month
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC, TUE, SUN
+from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC, TUE, SUN
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 

holidays/countries/jamaica.py

@@ -12,7 +12,7 @@
 from datetime import date
 from datetime import timedelta as td
 
-from holidays.calendars import _get_nth_weekday_from, _get_nth_weekday_of_month
+from holidays.calendars import _get_nth_weekday_of_month
 from holidays.constants import MAY, AUG, OCT, MON
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
@@ -31,16 +31,14 @@ class Jamaica(HolidayBase, ChristianHolidays, InternationalHolidays):
         InternationalHolidays.__init__(self)
         super().__init__(*args, **kwargs)
 
-    def _add_observed(self, hol_date: date, include_sat: bool = False) -> None:
+    def _add_observed(self, dt: date, include_sat: bool = False, 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)
-            self._add_holiday("%s (Observed)" % self[hol_date], obs_date)
+        if self._is_sunday(dt) or (include_sat and self._is_saturday(dt)):
+            self._add_holiday(
+                "%s (Observed)" % self[dt],
+                dt + td(days=+2 if self._is_saturday(dt) else days),
+            )
 
     def _populate(self, year):
         super()._populate(year)
@@ -58,9 +56,7 @@ class Jamaica(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_easter_monday("Easter Monday")
 
         # National Labour Day
-        self._add_observed(
-            self._add_holiday("National Labour Day", MAY, 23), include_sat=True
-        )
+        self._add_observed(self._add_holiday("National Labour Day", MAY, 23), include_sat=True)
 
         # Emancipation Day
         if year >= 1998:
@@ -70,18 +66,14 @@ class Jamaica(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_observed(self._add_holiday("Independence Day", AUG, 6))
 
         # National Heroes Day
-        self._add_holiday(
-            "National Heroes Day", _get_nth_weekday_of_month(3, MON, OCT, year)
-        )
+        self._add_holiday("National Heroes Day", _get_nth_weekday_of_month(3, MON, OCT, year))
 
         # Christmas Day
-        dt = self._add_christmas_day("Christmas Day")
+        self._add_observed(self._add_christmas_day("Christmas Day"), days=+2)
 
         # Boxing Day
         self._add_observed(self._add_christmas_day_two("Boxing Day"))
 
-        self._add_observed(dt)
-
 
 class JM(Jamaica):
     pass

holidays/countries/japan.py

@@ -15,8 +15,8 @@ from gettext import gettext as tr
 from typing import Tuple
 
 from holidays.calendars import _get_nth_weekday_of_month
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC, MON
+from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC, MON
+from holidays.helpers import _normalize_tuple
 from holidays.holiday_base import HolidayBase
 
 
@@ -28,10 +28,10 @@ class Japan(HolidayBase):
     country = "JP"
     default_language = "ja"
     special_holidays = {
-        1959: ((APR, 10, tr("結婚の儀")),),  # The Crown Prince marriage ceremony.
-        1989: ((FEB, 24, tr("大喪の礼")),),  # State Funeral of Emperor Shōwa.
-        1990: ((NOV, 12, tr("即位礼正殿の儀")),),  # Enthronement ceremony.
-        1993: ((JUN, 9, tr("結婚の儀")),),  # The Crown Prince marriage ceremony.
+        1959: (APR, 10, tr("結婚の儀")),  # The Crown Prince marriage ceremony.
+        1989: (FEB, 24, tr("大喪の礼")),  # State Funeral of Emperor Shōwa.
+        1990: (NOV, 12, tr("即位礼正殿の儀")),  # Enthronement ceremony.
+        1993: (JUN, 9, tr("結婚の儀")),  # The Crown Prince marriage ceremony.
         2019: (
             (MAY, 1, tr("天皇の即位の日")),  # Enthronement day.
             (OCT, 22, tr("即位礼正殿の儀が行われる日")),  # Enthronement ceremony.
@@ -68,9 +68,7 @@ class Japan(HolidayBase):
             observed_dates.add(self._add_holiday(tr("天皇誕生日"), FEB, 23))
 
         # Vernal Equinox Day.
-        observed_dates.add(
-            self._add_holiday(tr("春分の日"), *self._vernal_equinox_date)
-        )
+        observed_dates.add(self._add_holiday(tr("春分の日"), *self._vernal_equinox_date))
 
         # Showa Emperor's Birthday, Greenery Day or Showa Day.
         if year <= 1988:
@@ -101,9 +99,7 @@ class Japan(HolidayBase):
                     2020: date(2020, JUL, 23),
                     2021: date(2021, JUL, 22),
                 }
-                dt = dates.get(
-                    year, _get_nth_weekday_of_month(3, MON, JUL, year)
-                )
+                dt = dates.get(year, _get_nth_weekday_of_month(3, MON, JUL, year))
             # Marine Day.
             observed_dates.add(self._add_holiday(tr("海の日"), dt))
 
@@ -128,9 +124,7 @@ class Japan(HolidayBase):
             )
 
         # Autumnal Equinox Day.
-        observed_dates.add(
-            self._add_holiday(tr("秋分の日"), *self._autumnal_equinox_date)
-        )
+        observed_dates.add(self._add_holiday(tr("秋分の日"), *self._autumnal_equinox_date))
 
         # Physical Education and Sports Day.
         if year >= 1966:
@@ -164,7 +158,7 @@ class Japan(HolidayBase):
             observed_dates.add(self._add_holiday(tr("天皇誕生日"), DEC, 23))
 
         if self.observed:
-            for month, day, _ in self.special_holidays.get(year, ()):
+            for month, day, _ in _normalize_tuple(self.special_holidays.get(year, ())):
                 observed_dates.add(date(year, month, day))
 
             # When a national holiday falls on Sunday, next working day

holidays/countries/kazakhstan.py

@@ -14,13 +14,10 @@ from datetime import timedelta as td
 from holidays.calendars import JULIAN_CALENDAR
 from holidays.constants import MAR, MAY, JUL, AUG, OCT, DEC
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChristianHolidays, IslamicHolidays
-from holidays.holiday_groups import InternationalHolidays
+from holidays.holiday_groups import ChristianHolidays, IslamicHolidays, InternationalHolidays
 
 
-class Kazakhstan(
-    HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays
-):
+class Kazakhstan(HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays):
     """
     1. https://www.officeholidays.com/countries/kazakhstan/2020
     2. https://egov.kz/cms/en/articles/holidays-calend
@@ -65,15 +62,11 @@ class Kazakhstan(
                 observed_dates.add(self._add_holiday(name, MAR, 23))
 
         # Kazakhstan People Solidarity Holiday
-        observed_dates.add(
-            self._add_labor_day("Kazakhstan People Solidarity Holiday")
-        )
+        observed_dates.add(self._add_labor_day("Kazakhstan People Solidarity Holiday"))
 
         # Defender of the Fatherland Day
         if year >= 2013:
-            observed_dates.add(
-                self._add_holiday("Defender of the Fatherland Day", MAY, 7)
-            )
+            observed_dates.add(self._add_holiday("Defender of the Fatherland Day", MAY, 7))
 
         # Victory Day
         observed_dates.add(self._add_world_war_two_victory_day("Victory Day"))
@@ -85,9 +78,7 @@ class Kazakhstan(
         # Constitution Day of the Republic of Kazakhstan
         if year >= 1996:
             observed_dates.add(
-                self._add_holiday(
-                    "Constitution Day of the Republic of Kazakhstan", AUG, 30
-                )
+                self._add_holiday("Constitution Day of the Republic of Kazakhstan", AUG, 30)
             )
 
         # Republic Day
@@ -96,9 +87,7 @@ class Kazakhstan(
 
         # First President Day
         if 2012 <= year <= 2021:
-            observed_dates.add(
-                self._add_holiday("First President Day", DEC, 1)
-            )
+            observed_dates.add(self._add_holiday("First President Day", DEC, 1))
 
         # Kazakhstan Independence Day
         name = "Kazakhstan Independence Day"
@@ -117,11 +106,7 @@ class Kazakhstan(
                 obs_date = hol_date + td(days=+1)
                 while self._is_weekend(obs_date) or obs_date in observed_dates:
                     obs_date += td(days=+1)
-                observed_dates.add(
-                    self._add_holiday(
-                        "%s (Observed)" % self[hol_date], obs_date
-                    )
-                )
+                observed_dates.add(self._add_holiday("%s (Observed)" % self[hol_date], obs_date))
 
 
 class KZ(Kazakhstan):

holidays/countries/kenya.py

@@ -45,9 +45,7 @@ class Kenya(HolidayBase, ChristianHolidays, InternationalHolidays):
     def _populate(self, year):
         def _add_observed(dt: date, days: int = +1) -> None:
             if self.observed and self._is_sunday(dt):
-                self._add_holiday(
-                    "%s (Observed)" % self[dt], dt + td(days=days)
-                )
+                self._add_holiday("%s (Observed)" % self[dt], dt + td(days=days))
 
         if year <= 1962:
             return None

holidays/countries/kyrgyzstan.py

@@ -12,13 +12,10 @@
 from holidays.calendars import JULIAN_CALENDAR
 from holidays.constants import FEB, MAR, APR, MAY, AUG, NOV
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChristianHolidays, IslamicHolidays
-from holidays.holiday_groups import InternationalHolidays
+from holidays.holiday_groups import ChristianHolidays, IslamicHolidays, InternationalHolidays
 
 
-class Kyrgyzstan(
-    HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays
-):
+class Kyrgyzstan(HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays):
     """
     Kyrgyzstan holidays.
 

holidays/countries/latvia.py

@@ -48,9 +48,7 @@ class Latvia(HolidayBase):
         # Latvia proclaimed its independence from the USSR,
         #   and restoration of the Republic of Latvia.
         if year >= 1990:
-            self[
-                date(year, 5, 4)
-            ] = "Latvijas Republikas Neatkarības atjaunošanas diena"
+            self[date(year, 5, 4)] = "Latvijas Republikas Neatkarības atjaunošanas diena"
 
         # by law
         # https://likumi.lv/ta/id/72608-par-svetku-atceres-un-atzimejamam-dienam
@@ -65,9 +63,7 @@ class Latvia(HolidayBase):
 
         # Proclamation Day of the Republic of Latvia
         if year >= 1918:
-            self[
-                date(year, 11, 18)
-            ] = "Latvijas Republikas proklamēšanas diena"
+            self[date(year, 11, 18)] = "Latvijas Republikas proklamēšanas diena"
 
         # Christmas Eve
         self[date(year, 12, 24)] = "Ziemassvētku vakars"

holidays/countries/lesotho.py

@@ -9,56 +9,76 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import date
-from datetime import timedelta as td
-
-from dateutil.easter import easter
-
-from holidays.constants import JAN, MAR, APR, MAY, JUL, OCT, DEC
+from holidays.constants import MAR, APR, MAY, JUL, OCT
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Lesotho(HolidayBase):
+class Lesotho(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
-    https://tinyurl.com/lesothosmallurl1324251
-    https://www.timeanddate.com/holidays/lesotho/
+    References:
+    - https://en.wikipedia.org/wiki/Public_holidays_in_Lesotho
+    - https://www.ilo.org/dyn/travail/docs/2093/Public%20Holidays%20Act%201995.pdf  # noqa: E501
+    - https://www.timeanddate.com/holidays/lesotho/
     """
 
     country = "LS"
     special_holidays = {
-        # https://tinyurl.com/lesothourl
-        2002: ((APR, 4, "Heroes Day"), (MAY, 25, "Africa Day"))
+        2002: (MAY, 25, "Africa Day"),
     }
 
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
     def _populate(self, year):
+        if year <= 1995:
+            return None
+
         super()._populate(year)
 
-        if year > 1995:
-            # https://www.ilo.org/dyn/travail/docs/2093/Public%20Holidays%20Act%201995.pdf
-            self[date(year, JAN, 1)] = "New Year's Day"
-            self[date(year, MAR, 11)] = "Moshoeshoe's Day"
+        # New Year's Day.
+        self._add_new_years_day("New Year's Day")
+
+        # Moshoeshoe's Day.
+        self._add_holiday("Moshoeshoe's Day", MAR, 11)
+
+        if year <= 2002:
+            # Heroes Day.
+            self._add_holiday("Heroes Day", APR, 4)
+
+        if year >= 2003:
+            # Africa/Heroes Day.
+            self._add_africa_day("Africa/Heroes Day")
+
+        # Good Friday.
+        self._add_good_friday("Good Friday")
+
+        # Easter Monday.
+        self._add_easter_monday("Easter Monday")
+
+        # Workers' Day.
+        self._add_labor_day("Workers' Day")
 
-            if year < 2002:
-                self[date(year, APR, 4)] = "Heroes Day"
+        # Ascension Day.
+        self._add_ascension_thursday("Ascension Day")
 
-            if year > 2002:
-                self[date(year, MAY, 25)] = "Africa/Heroes Day"
+        # https://en.wikipedia.org/wiki/Letsie_III
+        self._add_holiday(
+            # King's Birthday.
+            "King's Birthday",
+            *((JUL, 17) if year >= 1998 else (MAY, 2)),
+        )
 
-            easter_date = easter(year)
-            self[easter_date + td(days=-2)] = "Good Friday"
-            self[easter_date + td(days=+1)] = "Easter Monday"
-            self[easter_date + td(days=+39)] = "Ascension Day"
-            self[date(year, MAY, 1)] = "Workers' Day"
+        # Independence Day.
+        self._add_holiday("Independence Day", OCT, 4)
 
-            if year > 1997:
-                # https://en.wikipedia.org/wiki/Letsie_III
-                self[date(year, JUL, 17)] = "King's Birthday"
-            if year <= 1997:
-                self[date(year, MAY, 2)] = "King's Birthday"
+        # Christmas Day.
+        self._add_christmas_day("Christmas Day")
 
-            self[date(year, OCT, 4)] = "National Independence Day"
-            self[date(year, DEC, 25)] = "Christmas Day"
-            self[date(year, DEC, 26)] = "Boxing Day"
+        # Boxing Day.
+        self._add_christmas_day_two("Boxing Day")
 
 
 class LS(Lesotho):

holidays/countries/lithuania.py

@@ -44,9 +44,7 @@ class Lithuania(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Day of Restoration of Independence of Lithuania
         # (from the Soviet Union, 1990).
         if year >= 1990:
-            self._add_holiday(
-                "Lietuvos nepriklausomybės atkūrimo diena", MAR, 11
-            )
+            self._add_holiday("Lietuvos nepriklausomybės atkūrimo diena", MAR, 11)
 
         # Easter.
         self._add_easter_sunday("Velykos")
@@ -58,14 +56,10 @@ class Lithuania(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_labor_day("Tarptautinė darbo diena")
 
         # Mother's day. First Sunday in May.
-        self._add_holiday(
-            "Motinos diena", _get_nth_weekday_of_month(1, SUN, MAY, year)
-        )
+        self._add_holiday("Motinos diena", _get_nth_weekday_of_month(1, SUN, MAY, year))
 
         # Fathers's day. First Sunday in June.
-        self._add_holiday(
-            "Tėvo diena", _get_nth_weekday_of_month(1, SUN, JUN, year)
-        )
+        self._add_holiday("Tėvo diena", _get_nth_weekday_of_month(1, SUN, JUN, year))
 
         # St. John's Day (Christian name).
         # Day of Dew (original pagan name).
@@ -81,9 +75,7 @@ class Lithuania(HolidayBase, ChristianHolidays, InternationalHolidays):
             )
 
         # Assumption Day.
-        self._add_assumption_of_mary_day(
-            "Žolinė (Švč. Mergelės Marijos ėmimo į dangų diena)"
-        )
+        self._add_assumption_of_mary_day("Žolinė (Švč. Mergelės Marijos ėmimo į dangų diena)")
 
         # All Saints' Day.
         self._add_all_saints_day("Visų šventųjų diena (Vėlinės)")

holidays/countries/madagascar.py

@@ -38,16 +38,12 @@ class Madagascar(HolidayBase):
         self[date(year, MAR, 8)] = "Fetin'ny vehivavy / Women's Day"
         self[date(year, MAR, 29)] = "Fetin'ny mahery fo / Martyrs' Day"
         self[date(year, MAY, 1)] = "Labour Day"
-        self[
-            _get_nth_weekday_of_month(3, SUN, JUN, year)
-        ] = "Fetin'ny ray / Father's Day"
+        self[_get_nth_weekday_of_month(3, SUN, JUN, year)] = "Fetin'ny ray / Father's Day"
 
         if year >= 1960:
             self[date(year, JUN, 26)] = "Independence Day"
 
-        self[
-            date(year, AUG, 15)
-        ] = "Fiakaran'ny Masina Maria tany an-danitra / Assumption Day"
+        self[date(year, AUG, 15)] = "Fiakaran'ny Masina Maria tany an-danitra / Assumption Day"
 
         self[date(year, NOV, 1)] = "Fetin'ny olo-masina / All Saints' Day"
 
@@ -66,9 +62,7 @@ class Madagascar(HolidayBase):
         whit_sunday = easter_date + td(days=+49)
         self[whit_sunday] = "Pentekosta / Whit Sunday"
 
-        self[
-            easter_date + td(days=+50)
-        ] = "Alatsinain'ny pentekosta / Whit Monday"
+        self[easter_date + td(days=+50)] = "Alatsinain'ny pentekosta / Whit Monday"
 
         dt = _get_nth_weekday_of_month(-1, SUN, MAY, year)
         if dt == whit_sunday:

holidays/countries/malawi.py

@@ -12,13 +12,12 @@
 from datetime import date
 from datetime import timedelta as td
 
-from dateutil.easter import easter
-
-from holidays.constants import JAN, MAR, MAY, JUL, OCT, DEC
+from holidays.constants import JAN, MAR, MAY, JUL, OCT
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Malawi(HolidayBase):
+class Malawi(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     https://www.officeholidays.com/countries/malawi
     https://www.timeanddate.com/holidays/malawi/
@@ -26,37 +25,46 @@ class Malawi(HolidayBase):
 
     country = "MW"
 
-    def _populate(self, year):
-        def _add_with_observed(
-            hol_date: date, hol_name: str, days: int = +1
-        ) -> None:
-            self[hol_date] = hol_name
-            if self.observed and self._is_weekend(hol_date):
-                obs_date = hol_date + td(
-                    days=+2 if self._is_saturday(hol_date) else days
-                )
-                self[obs_date] = f"{hol_name} (Observed)"
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
+    def _add_observed(self, dt: date, days: int = +1) -> None:
+        if self.observed and self._is_weekend(dt):
+            self._add_holiday(
+                "%s (Observed)" % self[dt],
+                dt + td(+2 if self._is_saturday(dt) else days),
+            )
 
+    def _populate(self, year):
         # Observed since 2000
         if year <= 1999:
             return None
 
         super()._populate(year)
 
-        _add_with_observed(date(year, JAN, 1), "New Year's Day")
-        _add_with_observed(date(year, JAN, 15), "John Chilembwe Day")
-        _add_with_observed(date(year, MAR, 3), "Martyrs Day")
+        self._add_observed(self._add_new_years_day("New Year's Day"))
+
+        self._add_observed(self._add_holiday("John Chilembwe Day", JAN, 15))
+
+        self._add_observed(self._add_holiday("Martyrs Day", MAR, 3))
+
+        self._add_good_friday("Good Friday")
+
+        self._add_easter_monday("Easter Monday")
+
+        self._add_observed(self._add_labor_day("Labour Day"))
+
+        self._add_observed(self._add_holiday("Kamuzu Day", MAY, 14))
+
+        self._add_observed(self._add_holiday("Independence Day", JUL, 6))
+
+        self._add_observed(self._add_holiday("Mother's Day", OCT, 15))
 
-        easter_date = easter(year)
-        self[easter_date + td(days=-2)] = "Good Friday"
-        self[easter_date + td(days=+1)] = "Easter Monday"
+        self._add_observed(self._add_christmas_day("Christmas Day"), days=+2)
 
-        _add_with_observed(date(year, MAY, 1), "Labour Day")
-        _add_with_observed(date(year, MAY, 14), "Kamuzu Day")
-        _add_with_observed(date(year, JUL, 6), "Independence Day")
-        _add_with_observed(date(year, OCT, 15), "Mother's Day")
-        _add_with_observed(date(year, DEC, 25), "Christmas Day", days=+2)
-        _add_with_observed(date(year, DEC, 26), "Boxing Day", days=+2)
+        self._add_observed(self._add_christmas_day_two("Boxing Day"), days=+2)
 
 
 class MW(Malawi):