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

holidays/countries/san_marino.py

@@ -9,16 +9,12 @@
 #  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, FEB, MAR, MAY, JUL, AUG, SEP, NOV, DEC
+from holidays.constants import FEB, MAR, JUL, SEP
 from holidays.holiday_base import HolidayBase
+from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
-class SanMarino(HolidayBase):
+class SanMarino(HolidayBase, ChristianHolidays, InternationalHolidays):
     """
     References:
       - https://en.wikipedia.org/wiki/Public_holidays_in_San_Marino
@@ -26,64 +22,67 @@ class SanMarino(HolidayBase):
 
     country = "SM"
 
+    def __init__(self, *args, **kwargs):
+        ChristianHolidays.__init__(self)
+        InternationalHolidays.__init__(self)
+        super().__init__(*args, **kwargs)
+
     def _populate(self, year: int) -> None:
         super()._populate(year)
 
         # New Year's Day.
-        self[date(year, JAN, 1)] = "New Year's Day"
+        self._add_new_years_day("New Year's Day")
 
         # Epiphany.
-        self[date(year, JAN, 6)] = "Epiphany"
+        self._add_epiphany_day("Epiphany")
 
         # Feast of Saint Agatha.
-        self[date(year, FEB, 5)] = "Feast of Saint Agatha"
+        self._add_holiday("Feast of Saint Agatha", FEB, 5)
 
         # Anniversary of the Arengo.
-        self[date(year, MAR, 25)] = "Anniversary of the Arengo"
-
-        easter_sunday = easter(year)
+        self._add_holiday("Anniversary of the Arengo", MAR, 25)
 
         # Easter Sunday.
-        self[easter_sunday] = "Easter Sunday"
+        self._add_easter_sunday("Easter Sunday")
 
         # Easter Monday.
-        self[easter_sunday + td(days=+1)] = "Easter Monday"
+        self._add_easter_monday("Easter Monday")
 
         # Labour Day.
-        self[date(year, MAY, 1)] = "Labour Day"
+        self._add_labor_day("Labour Day")
 
         # Corpus Cristi.
-        self[easter_sunday + td(days=+60)] = "Corpus Cristi"
+        self._add_corpus_christi_day("Corpus Cristi")
 
         # Liberation from Fascism Day.
-        self[date(year, JUL, 28)] = "Liberation from Fascism Day"
+        self._add_holiday("Liberation from Fascism Day", JUL, 28)
 
         # Assumption of Mary.
-        self[date(year, AUG, 15)] = "Assumption Day"
+        self._add_assumption_of_mary_day("Assumption Day")
 
         # The Feast of Saint Marinus and the Republic.
-        self[date(year, SEP, 3)] = "Foundation Day"
+        self._add_holiday("Foundation Day", SEP, 3)
 
         # All Saints' Day.
-        self[date(year, NOV, 1)] = "All Saints' Day"
+        self._add_all_saints_day("All Saints' Day")
 
         # Commemoration of the Dead.
-        self[date(year, NOV, 2)] = "Commemoration of the Dead"
+        self._add_all_souls_day("Commemoration of the Dead")
 
         # Immaculate Conception.
-        self[date(year, DEC, 8)] = "Immaculate Conception Day"
+        self._add_immaculate_conception_day("Immaculate Conception Day")
 
         # Christmas Eve.
-        self[date(year, DEC, 24)] = "Christmas Eve"
+        self._add_christmas_eve("Christmas Eve")
 
         # Christmas Day.
-        self[date(year, DEC, 25)] = "Christmas Day"
+        self._add_christmas_day("Christmas Day")
 
         # Saint Stephen's Day.
-        self[date(year, DEC, 26)] = "Saint Stephen's Day"
+        self._add_christmas_day_two("Saint Stephen's Day")
 
         # New Year's Eve.
-        self[date(year, DEC, 31)] = "New Year's Eve"
+        self._add_new_years_eve("New Year's Eve")
 
 
 class SM(SanMarino):

holidays/countries/saudi_arabia.py

@@ -36,40 +36,30 @@ class SaudiArabia(HolidayBase, IslamicHolidays):
     country = "SA"
     special_holidays = {
         # celebrate the country's win against Argentina in the World Cup
-        2022: ((NOV, 23, "National Holiday"),),
+        2022: (NOV, 23, "National Holiday"),
     }
 
     def __init__(self, *args, **kwargs):
         IslamicHolidays.__init__(self)
         super().__init__(*args, **kwargs)
 
-    def _add_islamic_observed(
-        self, hol_name: str, hol_dates: Set[date]
-    ) -> None:
+    def _add_islamic_observed(self, hol_name: str, hol_dates: Set[date]) -> None:
         if not self.observed:
             return None
         for dt in hol_dates:
-            weekend_days = sum(
-                self._is_weekend(dt + td(days=i)) for i in range(4)
-            )
+            weekend_days = sum(self._is_weekend(dt + td(days=i)) for i in range(4))
             for i in range(weekend_days):
-                self._add_holiday(
-                    f"{hol_name} (Observed)", dt + td(days=+4 + i)
-                )
+                self._add_holiday(f"{hol_name} (Observed)", dt + td(days=+4 + i))
 
     def _add_observed(self, hol_date: date) -> None:
         if self.observed:
             weekend = sorted(self.weekend)
             # 1st weekend day (Thursday before 2013 and Friday otherwise)
             if hol_date.weekday() == weekend[0]:
-                self._add_holiday(
-                    f"{self[hol_date]} (Observed)", hol_date + td(days=-1)
-                )
+                self._add_holiday(f"{self[hol_date]} (Observed)", hol_date + td(days=-1))
             # 2nd weekend day (Friday before 2013 and Saturday otherwise)
             elif hol_date.weekday() == weekend[1]:
-                self._add_holiday(
-                    f"{self[hol_date]} (Observed)", hol_date + td(days=+1)
-                )
+                self._add_holiday(f"{self[hol_date]} (Observed)", hol_date + td(days=+1))
 
     def _populate(self, year):
         super()._populate(year)
@@ -113,9 +103,7 @@ class SaudiArabia(HolidayBase, IslamicHolidays):
         if year >= 2005:
             dt = date(year, SEP, 23)
             if dt not in self:
-                self._add_observed(
-                    self._add_holiday("National Day Holiday", dt)
-                )
+                self._add_observed(self._add_holiday("National Day Holiday", dt))
 
         # Founding Day holiday (started 2022).
         # Note: if founding day happens within the Eid al-Fitr Holiday or
@@ -123,9 +111,7 @@ class SaudiArabia(HolidayBase, IslamicHolidays):
         if year >= 2022:
             dt = date(year, FEB, 22)
             if dt not in self:
-                self._add_observed(
-                    self._add_holiday("Founding Day Holiday", dt)
-                )
+                self._add_observed(self._add_holiday("Founding Day Holiday", dt))
 
         # observed holidays special cases
         if self.observed and year == 2001:

holidays/countries/serbia.py

@@ -12,11 +12,10 @@
 from datetime import date
 from datetime import timedelta as td
 from gettext import gettext as tr
-from typing import Optional
 
 from holidays.calendars import JULIAN_CALENDAR
-from holidays.constants import JAN, FEB, NOV
-from holidays.holiday_base import DateLike, HolidayBase
+from holidays.constants import FEB
+from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
 
 
@@ -30,54 +29,46 @@ class Serbia(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "RS"
     default_language = "sr"
+    supported_languages = ("en_US", "sr")
 
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self, JULIAN_CALENDAR)
         InternationalHolidays.__init__(self)
         super().__init__(*args, **kwargs)
 
-    def _add_observed_holiday(
-        self, name: str, *dt: DateLike
-    ) -> Optional[date]:
-        return self._add_holiday(
-            self.tr("%s (Слободан дан)") % self.tr(name), *dt
-        )
+    def _add_observed(self, dt: date, days: int = +1) -> None:
+        if self.observed and self._is_sunday(dt):
+            self._add_holiday(self.tr("%s (слободан дан)") % self[dt], dt + td(days))
 
     def _populate(self, year):
         super()._populate(year)
 
         # New Year's Day.
-        name = self.tr("Нова година")
-        self._add_new_years_day(name)
-        self._add_new_years_day_two(name)
-        if self.observed and self._is_weekend(JAN, 1):
-            self._add_observed_holiday(name, JAN, 3)
+        name = tr("Нова година")
+        self._add_observed(self._add_new_years_day(name), days=+2)
+        self._add_observed(self._add_new_years_day_two(name))
 
         # Orthodox Christmas.
         self._add_christmas_day(tr("Божић"))
 
         # Statehood Day.
-        name = self.tr("Дан државности Србије")
-        self._add_holiday(name, FEB, 15)
-        self._add_holiday(name, FEB, 16)
-        if self.observed and self._is_weekend(FEB, 15):
-            self._add_observed_holiday(name, FEB, 17)
+        name = tr("Дан државности Србије")
+        self._add_observed(self._add_holiday(name, FEB, 15), days=+2)
+        self._add_observed(self._add_holiday(name, FEB, 16))
 
         # International Workers' Day.
         name = tr("Празник рада")
         may_1 = self._add_labor_day(name)
-        may_2 = self._add_holiday(name, may_1 + td(days=+1))
-        if self.observed and self._is_weekend(may_1):
-            self._add_observed_holiday(
-                name,
-                may_2 + td(days=+2 if may_2 == self._easter_sunday else +1),
-            )
-
-        # Armistice Day.
-        name = tr("Дан примирја у Првом светском рату")
-        nov_11 = self._add_holiday(name, NOV, 11)
-        if self.observed and self._is_sunday(nov_11):
-            self._add_holiday(name, nov_11 + td(days=+1))
+        self._add_observed(may_1, days=+2)
+        self._add_observed(
+            self._add_holiday(name, may_1 + td(days=+1)),
+            days=+2 if may_1 + td(days=+1) == self._easter_sunday else +1,
+        )
+
+        self._add_observed(
+            # Armistice Day.
+            self._add_remembrance_day(tr("Дан примирја у Првом светском рату"))
+        )
 
         # Good Friday.
         self._add_good_friday(tr("Велики петак"))