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

holidays/countries/ecuador.py

@@ -34,13 +34,49 @@ class Ecuador(HolidayBase, ChristianHolidays, InternationalHolidays):
         InternationalHolidays.__init__(self)
         super().__init__(*args, **kwargs)
 
+    def _add_observed(
+        self,
+        dt: date,
+        weekend_only: bool = False,
+        before: bool = True,
+        after: bool = True,
+    ) -> None:
+        if self.observed and self._year >= 2017:
+            obs_date = None
+            # Art. 1 of Law #0 from 20.12.2016
+            # When holidays falls on Tuesday, the rest shall be transferred to
+            # preceding Monday, and if they falls on Wednesday or Thursday,
+            # the rest shall be transferred to Friday of the same week.
+            # Exceptions to this provision are January 1, December 25 and
+            # Shrove Tuesday.
+            if not weekend_only:
+                if self._is_tuesday(dt) and before:
+                    obs_date = dt + td(days=-1)
+                elif self._is_wednesday(dt):
+                    obs_date = dt + td(days=+2)
+                elif self._is_thursday(dt) and after:
+                    obs_date = dt + td(days=+1)
+            # When holidays falls on Saturday or Sunday, the rest shall be
+            # transferred, respectively, to the preceding Friday or the
+            # following Monday.
+            if self._is_saturday(dt) and before:
+                obs_date = dt + td(days=-1)
+            elif self._is_sunday(dt) and after:
+                obs_date = dt + td(days=+1)
+            if obs_date:
+                self._add_holiday(self.tr("%s (Observado)") % self[dt], obs_date)
+
     def _populate(self, year):
         super()._populate(year)
-        observed_dates = set()
-        observed_weekend_dates = set()
 
         # New Year's Day.
-        observed_weekend_dates.add(self._add_new_years_day(tr("Año Nuevo")))
+        name = tr("Año Nuevo")
+        self._add_observed(self._add_new_years_day(name), weekend_only=True)
+
+        if self.observed and year >= 2017:
+            dec_31 = (DEC, 31)
+            if self._is_friday(*dec_31):
+                self._add_holiday(self.tr("%s (Observado)") % self.tr(name), *dec_31)
 
         # Carnival.
         name = tr("Carnaval")
@@ -51,77 +87,41 @@ class Ecuador(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_good_friday(tr("Viernes Santo"))
 
         # Labour Day.
-        observed_dates.add(self._add_labor_day(tr("Día del Trabajo")))
+        self._add_observed(self._add_labor_day(tr("Día del Trabajo")))
 
-        observed_dates.add(
+        self._add_observed(
             # The Battle of Pichincha.
             self._add_holiday(tr("Batalla de Pichincha"), MAY, 24)
         )
 
-        observed_dates.add(
+        self._add_observed(
             # Declaration of Independence of Quito.
             self._add_holiday(tr("Primer Grito de Independencia"), AUG, 10)
         )
 
-        observed_dates.add(
+        self._add_observed(
             # Independence of Guayaquil.
             self._add_holiday(tr("Independencia de Guayaquil"), OCT, 9)
         )
 
-        # All Souls' Day.
-        observed_dates.add(self._add_all_souls_day(tr("Día de los Difuntos")))
+        self._add_observed(
+            # All Souls' Day.
+            self._add_all_souls_day(tr("Día de los Difuntos")),
+            after=False,
+        )
 
-        observed_dates.add(
+        self._add_observed(
             # Independence of Cuenca.
-            self._add_holiday(tr("Independencia de Cuenca"), NOV, 3)
+            self._add_holiday(tr("Independencia de Cuenca"), NOV, 3),
+            before=False,
         )
 
-        observed_weekend_dates.add(
+        self._add_observed(
             # Christmas Day.
-            self._add_christmas_day(tr("Día de Navidad"))
+            self._add_christmas_day(tr("Día de Navidad")),
+            weekend_only=True,
         )
 
-        if self.observed and year >= 2017:
-            # Art. 1 of Law #0 from 20.12.2016
-            # When holidays falls on Tuesday, the rest shall be transferred to
-            # preceding Monday, and if they falls on Wednesday or Thursday,
-            # the rest shall be transferred to Friday of the same week.
-            # Exceptions to this provision are January 1, December 25 and
-            # Shrove Tuesday.
-            for dt in observed_dates:
-                obs_date = None
-                if self._is_tuesday(dt):
-                    obs_date = dt + td(days=-1)
-                elif self._is_wednesday(dt):
-                    obs_date = dt + td(days=+2)
-                elif self._is_thursday(dt):
-                    obs_date = dt + td(days=+1)
-                if obs_date and obs_date not in observed_dates:
-                    self._add_holiday(
-                        self.tr("%s (Observado)") % self[dt], obs_date
-                    )
-
-            # When holidays falls on Saturday or Sunday, the rest shall be
-            # transferred, respectively, to the preceding Friday or the
-            # following Monday.
-            observed_dates = observed_dates.union(observed_weekend_dates)
-            for dt in observed_dates:
-                obs_date = None
-                if self._is_saturday(dt):
-                    obs_date = dt + td(days=-1)
-                elif self._is_sunday(dt):
-                    obs_date = dt + td(days=+1)
-                if obs_date and obs_date not in observed_dates:
-                    self._add_holiday(
-                        self.tr("%s (Observado)") % self[dt], obs_date
-                    )
-
-            dec_31 = date(year, DEC, 31)
-            if self._is_friday(dec_31):
-                self._add_holiday(
-                    self.tr("%s (Observado)") % self.tr("Año Nuevo"), dec_31
-                )
-
 
 class EC(Ecuador):
     pass

holidays/countries/egypt.py

@@ -12,13 +12,10 @@
 from holidays.calendars import JULIAN_CALENDAR
 from holidays.constants import JAN, APR, JUN, JUL, OCT
 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 Egypt(
-    HolidayBase, ChristianHolidays, IslamicHolidays, InternationalHolidays
-):
+class Egypt(HolidayBase, ChristianHolidays, IslamicHolidays, InternationalHolidays):
     # Holidays here are estimates, it is common for the day to be pushed
     # if falls in a weekend, although not a rule that can be implemented.
     # Holidays after 2020: the following four moving date holidays whose exact

holidays/countries/eswatini.py

@@ -13,13 +13,12 @@ import warnings
 from datetime import date
 from datetime import timedelta as td
 
-from dateutil.easter import easter
-
-from holidays.constants import JAN, APR, MAY, JUL, SEP, DEC
+from holidays.constants import JAN, APR, JUL, SEP, DEC
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Eswatini(HolidayBase):
+class Eswatini(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     https://swazilii.org/sz/legislation/act/1938/71
     https://www.officeholidays.com/countries/swaziland
@@ -28,63 +27,54 @@ class Eswatini(HolidayBase):
     country = "SZ"
     special_holidays = {
         # https://mg.co.za/article/1999-12-09-swaziland-declares-bank-holidays/
-        1999: ((DEC, 31, "Y2K changeover"),),
-        2000: ((JAN, 3, "Y2K changeover"),),
+        1999: (DEC, 31, "Y2K changeover"),
+        2000: (JAN, 3, "Y2K changeover"),
     }
 
-    def _populate(self, year):
-        def _add_with_observed(
-            hol_date: date, hol_name: str, days: int = +1
-        ) -> None:
-            # As of 2021/1/1, whenever a public holiday falls on a Sunday
-            # it rolls over to the following Monday
-            self[hol_date] = hol_name
-            if self.observed and self._is_sunday(hol_date) and year >= 2021:
-                self[hol_date + td(days=days)] = 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:
+        # As of 2021/1/1, whenever a public holiday falls on a Sunday
+        # it rolls over to the following Monday
+        if self.observed and self._is_sunday(dt) and self._year >= 2021:
+            self._add_holiday("%s (Observed)" % self[dt], dt + td(days=days))
+
+    def _populate(self, year):
         # Observed since 1939
         if year <= 1938:
             return None
 
         super()._populate(year)
 
-        _add_with_observed(date(year, JAN, 1), "New Year's Day")
+        self._add_observed(self._add_new_years_day("New Year's Day"))
 
-        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._add_good_friday("Good Friday")
+
+        self._add_easter_monday("Easter Monday")
+
+        self._add_ascension_thursday("Ascension Day")
 
         if year >= 1987:
-            # https://www.officeholidays.com/holidays/swaziland/birthday-of-king-mswati-iii
-            # In 2071, 2076, 2082 Apr 20 is Easter Monday,
-            # so observed on Apr 21 (Tue)
-            _add_with_observed(
-                date(year, APR, 19),
-                "King's Birthday",
-                +2 if year in {2071, 2076, 2082} else +1,
-            )
+            apr_19 = self._add_holiday("King's Birthday", APR, 19)
+            self._add_observed(apr_19, days=+2 if apr_19 == self._easter_sunday else +1)
 
         if year >= 1969:
-            # In 2038 Apr 26 is Easter Monday,
-            # so observed on Apr 27 (Tue)
-            _add_with_observed(
-                date(year, APR, 25),
-                "National Flag Day",
-                +2 if year == 2038 else +1,
-            )
+            apr_25 = self._add_holiday("National Flag Day", APR, 25)
+            self._add_observed(apr_25, days=+2 if apr_25 == self._easter_sunday else +1)
 
-        _add_with_observed(date(year, MAY, 1), "Worker's Day")
+        self._add_observed(self._add_labor_day("Worker's Day"))
 
         if year >= 1983:
-            # https://www.officeholidays.com/holidays/swaziland/birthday-of-late-king-sobhuza
-            _add_with_observed(
-                date(year, JUL, 22), "Birthday of Late King Sobhuza"
-            )
-
-        _add_with_observed(date(year, SEP, 6), "Independence Day")
-        _add_with_observed(date(year, DEC, 25), "Christmas Day", days=+2)
-        _add_with_observed(date(year, DEC, 26), "Boxing Day")
+            self._add_observed(self._add_holiday("Birthday of Late King Sobhuza", JUL, 22))
+
+        self._add_observed(self._add_holiday("Independence Day", SEP, 6))
+
+        self._add_observed(self._add_christmas_day("Christmas Day"), days=+2)
+
+        self._add_observed(self._add_christmas_day_two("Boxing Day"))
 
 
 class Swaziland(Eswatini):

holidays/countries/ethiopia.py

@@ -14,8 +14,7 @@ from gettext import gettext as tr
 from holidays.calendars import JULIAN_CALENDAR
 from holidays.constants import MAR, MAY, SEP
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
-from holidays.holiday_groups import IslamicHolidays
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays, IslamicHolidays
 
 # Ethiopian holidays are estimated: it is common for the day to be pushed
 # if falls in a weekend, although not a rule that can be implemented.
@@ -31,9 +30,7 @@ from holidays.holiday_groups import IslamicHolidays
 # is_weekend function is there, however not activated for accuracy.
 
 
-class Ethiopia(
-    HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays
-):
+class Ethiopia(HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays):
     country = "ET"
     default_language = "am"
     estimated_label = tr("%s* (*ግምት)")
@@ -70,14 +67,10 @@ class Ethiopia(
         # September 12.
 
         # Ethiopian New Year.
-        self._add_holiday(
-            tr("አዲስ ዓመት እንቁጣጣሽ"), SEP, 12 if self._is_leap_year(year) else 11
-        )
+        self._add_holiday(tr("አዲስ ዓመት እንቁጣጣሽ"), SEP, 12 if self._is_leap_year(year) else 11)
 
         # Finding of True Cross.
-        self._add_holiday(
-            tr("መስቀል"), SEP, 28 if self._is_leap_year(year) else 27
-        )
+        self._add_holiday(tr("መስቀል"), SEP, 28 if self._is_leap_year(year) else 27)
 
         # Orthodox Christmas.
         self._add_christmas_day(tr("ገና"))
@@ -108,9 +101,7 @@ class Ethiopia(
 
         if year < 1991 and year > 1974:
             # Downfall of King Haile Selassie.
-            self._add_holiday(
-                tr("ደርግ የመጣበት ቀን"), SEP, 13 if self._is_leap_year(year) else 12
-            )
+            self._add_holiday(tr("ደርግ የመጣበት ቀን"), SEP, 13 if self._is_leap_year(year) else 12)
 
         # Eid al-Fitr.
         self._add_eid_al_fitr_day(tr("ኢድ አልፈጥር"))

holidays/countries/finland.py

@@ -42,9 +42,7 @@ class Finland(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Epiphany.
         name = tr("Loppiainen")
         if 1973 <= year <= 1990:
-            self._add_holiday(
-                name, _get_nth_weekday_from(1, SAT, date(year, JAN, 6))
-            )
+            self._add_holiday(name, _get_nth_weekday_from(1, SAT, date(year, JAN, 6)))
         else:
             self._add_epiphany_day(name)
 

holidays/countries/gabon.py

@@ -9,17 +9,13 @@
 #  Website: https://github.com/dr-prodigy/python-holidays
 #  License: MIT (see LICENSE file)
 
-from holidays.calendars import _CustomCalendar, _IslamicLunar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC
+from holidays.calendars import _CustomIslamicCalendar
+from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV, DEC
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
-from holidays.holiday_groups import IslamicHolidays
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays, IslamicHolidays
 
 
-class Gabon(
-    HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays
-):
+class Gabon(HolidayBase, ChristianHolidays, InternationalHolidays, IslamicHolidays):
     """
     References:
       - https://en.wikipedia.org/wiki/Public_holidays_in_Gabon
@@ -90,54 +86,54 @@ class GAB(Gabon):
     pass
 
 
-class GabonIslamicCalendar(_CustomCalendar, _IslamicLunar):
+class GabonIslamicCalendar(_CustomIslamicCalendar):
     EID_AL_ADHA_DATES = {
-        2001: ((MAR, 6),),
-        2002: ((FEB, 23),),
-        2003: ((FEB, 12),),
-        2004: ((FEB, 2),),
-        2005: ((JAN, 21),),
+        2001: (MAR, 6),
+        2002: (FEB, 23),
+        2003: (FEB, 12),
+        2004: (FEB, 2),
+        2005: (JAN, 21),
         2006: ((JAN, 10), (DEC, 31)),
-        2007: ((DEC, 20),),
-        2008: ((DEC, 9),),
-        2009: ((NOV, 28),),
-        2010: ((NOV, 17),),
-        2011: ((NOV, 7),),
-        2012: ((OCT, 26),),
-        2013: ((OCT, 15),),
-        2014: ((OCT, 5),),
-        2015: ((SEP, 24),),
-        2016: ((SEP, 13),),
-        2017: ((SEP, 2),),
-        2018: ((AUG, 22),),
-        2019: ((AUG, 11),),
-        2020: ((JUL, 31),),
-        2021: ((JUL, 20),),
-        2022: ((JUL, 9),),
+        2007: (DEC, 20),
+        2008: (DEC, 9),
+        2009: (NOV, 28),
+        2010: (NOV, 17),
+        2011: (NOV, 7),
+        2012: (OCT, 26),
+        2013: (OCT, 15),
+        2014: (OCT, 5),
+        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 = {
-        2001: ((DEC, 17),),
-        2002: ((DEC, 6),),
-        2003: ((NOV, 26),),
-        2004: ((NOV, 14),),
-        2005: ((NOV, 4),),
-        2006: ((OCT, 24),),
-        2007: ((OCT, 13),),
-        2008: ((OCT, 2),),
-        2009: ((SEP, 21),),
-        2010: ((SEP, 10),),
-        2011: ((AUG, 31),),
-        2012: ((AUG, 19),),
-        2013: ((AUG, 8),),
-        2014: ((JUL, 29),),
-        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),),
+        2001: (DEC, 17),
+        2002: (DEC, 6),
+        2003: (NOV, 26),
+        2004: (NOV, 14),
+        2005: (NOV, 4),
+        2006: (OCT, 24),
+        2007: (OCT, 13),
+        2008: (OCT, 2),
+        2009: (SEP, 21),
+        2010: (SEP, 10),
+        2011: (AUG, 31),
+        2012: (AUG, 19),
+        2013: (AUG, 8),
+        2014: (JUL, 29),
+        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),
     }

holidays/countries/greece.py

@@ -12,8 +12,7 @@
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from holidays.calendars import _get_nth_weekday_from, JULIAN_CALENDAR
-from holidays.calendars import GREGORIAN_CALENDAR
+from holidays.calendars import _get_nth_weekday_from, JULIAN_CALENDAR, GREGORIAN_CALENDAR
 from holidays.constants import MAR, OCT, MON
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays

holidays/countries/honduras.py

@@ -12,42 +12,45 @@
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from dateutil.easter import easter
-
 from holidays.calendars import _get_nth_weekday_of_month
-from holidays.constants import JAN, APR, MAY, SEP, OCT, DEC, WED
+from holidays.constants import APR, SEP, OCT, WED
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class Honduras(HolidayBase):
+class Honduras(HolidayBase, ChristianHolidays, InternationalHolidays):
     # Artículo 339 del Código del Trabajo:
-    # https://www.ilo.org/dyn/natlex/docs/WEBTEXT/29076/64849/S59HND01.htm#:~:text=El%20presente%20C%C3%B3digo%20regula%20las,compensaci%C3%B3n%20equitativa%20de%20su%20inversi%C3%B3n.
+    # https://www.ilo.org/dyn/natlex/docs/WEBTEXT/29076/64849/S59HND01.htm
 
     country = "HN"
     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):
         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"))
 
-        easter_date = easter(year)
         # 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"))
 
         # Holy Saturday.
-        self._add_holiday(tr("Sábado de Gloria"), easter_date + td(days=-1))
+        self._add_holy_saturday(tr("Sábado de Gloria"))
 
         # Panamerican Day.
         self._add_holiday(tr("Día de las Américas"), APR, 14)
 
         # Labor Day.
-        self._add_holiday(tr("Día del Trabajo"), MAY, 1)
+        self._add_labor_day(tr("Día del Trabajo"))
 
         # Independence Day.
         self._add_holiday(tr("Día de la Independencia"), SEP, 15)
@@ -58,7 +61,7 @@ class Honduras(HolidayBase):
             self._add_holiday(tr("Día de Morazán"), OCT, 3)
 
             # Columbus Day.
-            self._add_holiday(tr("Día de la Raza"), OCT, 12)
+            self._add_columbus_day(tr("Día de la Raza"))
 
             # Army Day.
             self._add_holiday(tr("Día de las Fuerzas Armadas"), OCT, 21)
@@ -72,7 +75,7 @@ class Honduras(HolidayBase):
             self._add_holiday(holiday_name, first_wednesday + td(days=+2))
 
         # Christmas.
-        self._add_holiday(tr("Navidad"), DEC, 25)
+        self._add_christmas_day(tr("Navidad"))
 
 
 class HN(Honduras):

holidays/countries/hongkong.py

@@ -16,8 +16,11 @@ from typing import Optional
 from holidays.calendars import _get_nth_weekday_of_month
 from holidays.constants import JUN, JUL, AUG, SEP, OCT, MON
 from holidays.holiday_base import HolidayBase
-from holidays.holiday_groups import ChineseCalendarHolidays, ChristianHolidays
-from holidays.holiday_groups import InternationalHolidays
+from holidays.holiday_groups import (
+    ChineseCalendarHolidays,
+    ChristianHolidays,
+    InternationalHolidays,
+)
 
 
 class HongKong(
@@ -112,9 +115,7 @@ class HongKong(
         name = "Ching Ming Festival"
         ching_ming_date = self._qingming_date
         if self.observed and ching_ming_date == easter_monday_date:
-            self._add_holiday(
-                f"{day_following}{name}", ching_ming_date + td(days=+1)
-            )
+            self._add_holiday(f"{day_following}{name}", ching_ming_date + td(days=+1))
         elif ching_ming_date not in {
             self._easter_sunday + td(days=-2),
             self._easter_sunday + td(days=-1),
@@ -169,9 +170,7 @@ class HongKong(
                         mid_autumn_date + td(days=+2),
                     )
             else:
-                self._add_mid_autumn_festival_day_two(
-                    f"The day following the {name}"
-                )
+                self._add_mid_autumn_festival_day_two(f"The day following the {name}")
         else:
             self._add_mid_autumn_festival_day_two(name)