holidays 0.47__py3-none-any.whl → 0.49__py3-none-any.whl

holidays/groups/christian.py

@@ -11,11 +11,10 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from datetime import timedelta as td
 
 from dateutil.easter import EASTER_ORTHODOX, EASTER_WESTERN, easter
 
-from holidays.calendars.gregorian import GREGORIAN_CALENDAR, JAN, DEC
+from holidays.calendars.gregorian import GREGORIAN_CALENDAR, JAN, DEC, _timedelta
 from holidays.calendars.julian import JULIAN_CALENDAR
 from holidays.calendars.julian_revised import JULIAN_REVISED_CALENDAR
 
@@ -123,7 +122,7 @@ class ChristianHolidays:
         Day, or sometimes Holy Thursday.
         https://en.wikipedia.org/wiki/Feast_of_the_Ascension
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=+39))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, +39))
 
     def _add_ash_monday(self, name) -> date:
         """
@@ -133,7 +132,7 @@ class ChristianHolidays:
         or Green Monday. The first day of Great Lent.
         https://en.wikipedia.org/wiki/Clean_Monday
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=-48))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, -48))
 
     def _add_ash_wednesday(self, name) -> date:
         """
@@ -142,7 +141,7 @@ class ChristianHolidays:
         A holy day of prayer and fasting. It marks the beginning of Lent.
         https://en.wikipedia.org/wiki/Ash_Wednesday
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=-46))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, -46))
 
     def _add_assumption_of_mary_day(self, name, calendar=None) -> date:
         """
@@ -182,7 +181,7 @@ class ChristianHolidays:
         the liturgical season of Lent.
         https://en.wikipedia.org/wiki/Carnival
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=-48))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, -48))
 
     def _add_carnival_tuesday(self, name) -> date:
         """
@@ -192,7 +191,7 @@ class ChristianHolidays:
         the liturgical season of Lent.
         https://en.wikipedia.org/wiki/Carnival
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=-47))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, -47))
 
     def _add_christmas_day(self, name, calendar=None) -> date:
         """
@@ -212,7 +211,7 @@ class ChristianHolidays:
         https://en.wikipedia.org/wiki/Boxing_Day
         https://en.wikipedia.org/wiki/Christmas
         """
-        return self._add_holiday(name, self.__get_christmas_day(calendar) + td(days=+1))
+        return self._add_holiday(name, _timedelta(self.__get_christmas_day(calendar), +1))
 
     def _add_christmas_day_three(self, name, calendar=None) -> date:
         """
@@ -221,7 +220,7 @@ class ChristianHolidays:
         A holiday celebrated 2 days after Christmas Day (in some countries).
         https://en.wikipedia.org/wiki/Christmas
         """
-        return self._add_holiday(name, self.__get_christmas_day(calendar) + td(days=+2))
+        return self._add_holiday(name, _timedelta(self.__get_christmas_day(calendar), +2))
 
     def _add_christmas_eve(self, name, calendar=None) -> date:
         """
@@ -231,7 +230,7 @@ class ChristianHolidays:
         the festival commemorating the birth of Jesus Christ.
         https://en.wikipedia.org/wiki/Christmas_Eve
         """
-        return self._add_holiday(name, self.__get_christmas_day(calendar) + td(days=-1))
+        return self._add_holiday(name, _timedelta(self.__get_christmas_day(calendar), -1))
 
     def _add_corpus_christi_day(self, name) -> date:
         """
@@ -243,7 +242,7 @@ class ChristianHolidays:
         of Jesus Christ in the elements of the Eucharist.
         https://en.wikipedia.org/wiki/Feast_of_Corpus_Christi
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=+60))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, +60))
 
     def _add_easter_monday(self, name, calendar=None) -> date:
         """
@@ -254,7 +253,7 @@ class ChristianHolidays:
         some countries.
         https://en.wikipedia.org/wiki/Easter_Monday
         """
-        return self._add_holiday(name, self.__get_easter_sunday(calendar) + td(days=+1))
+        return self._add_holiday(name, _timedelta(self.__get_easter_sunday(calendar), +1))
 
     def _add_easter_sunday(self, name, calendar=None) -> date:
         """
@@ -294,7 +293,7 @@ class ChristianHolidays:
         Great Friday, Great and Holy Friday.
         https://en.wikipedia.org/wiki/Good_Friday
         """
-        return self._add_holiday(name, self.__get_easter_sunday(calendar) + td(days=-2))
+        return self._add_holiday(name, _timedelta(self.__get_easter_sunday(calendar), -2))
 
     def _add_holy_saturday(self, name) -> date:
         """
@@ -303,7 +302,7 @@ class ChristianHolidays:
         Great and Holy Saturday is a day between Good Friday and Easter Sunday.
         https://en.wikipedia.org/wiki/Holy_Saturday
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=-1))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, -1))
 
     def _add_holy_thursday(self, name) -> date:
         """
@@ -314,7 +313,7 @@ class ChristianHolidays:
         Jesus Christ with the Apostles, as described in the canonical gospels.
         https://en.wikipedia.org/wiki/Maundy_Thursday
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=-3))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, -3))
 
     def _add_immaculate_conception_day(self, name) -> date:
         """
@@ -345,7 +344,7 @@ class ChristianHolidays:
         Palm Sunday marks the first day of Holy Week.
         https://en.wikipedia.org/wiki/Palm_Sunday
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=-7))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, -7))
 
     def _add_rejoicing_day(self, name) -> date:
         """
@@ -356,7 +355,7 @@ class ChristianHolidays:
         Pascha (Easter).In Ukrainian tradition it is called Provody.
         https://en.wikipedia.org/wiki/Radonitsa
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=+9))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, +9))
 
     def _add_saint_georges_day(self, name) -> date:
         """
@@ -418,7 +417,7 @@ class ChristianHolidays:
         https://en.wikipedia.org/wiki/Pentecost
         https://en.wikipedia.org/wiki/Whit_Monday
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=+50))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, +50))
 
     def _add_whit_sunday(self, name) -> date:
         """
@@ -430,4 +429,4 @@ class ChristianHolidays:
         Feast of Weeks.
         https://en.wikipedia.org/wiki/Pentecost
         """
-        return self._add_holiday(name, self._easter_sunday + td(days=+49))
+        return self._add_holiday(name, _timedelta(self._easter_sunday, +49))

holidays/groups/international.py

@@ -194,3 +194,13 @@ class InternationalHolidays:
         https://en.wikipedia.org/wiki/Victory_Day_(9_May)
         """
         return self._add_holiday_may_9(name)
+
+    def _add_united_nations_day(self, name):
+        """
+        Add United Nations Day (Oct 24th)
+
+        United Nations Day is an annual commemorative day, reflecting the
+        official creation of the United Nations on 24 October 1945.
+        https://en.wikipedia.org/wiki/United_Nations_Day
+        """
+        return self._add_holiday_oct_24(name)

holidays/groups/islamic.py

@@ -11,10 +11,10 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from datetime import timedelta as td
 from typing import Iterable, Set, Tuple
 
 from holidays.calendars import _IslamicLunar
+from holidays.calendars.gregorian import _timedelta
 
 
 class IslamicHolidays:
@@ -264,7 +264,7 @@ class IslamicHolidays:
         estimated_label = getattr(self, "estimated_label", "%s (estimated)")
         for dt, is_estimated in dates:
             if days_delta != 0:
-                dt += td(days=days_delta)
+                dt = _timedelta(dt, days_delta)
 
             dt = self._add_holiday(
                 self.tr(estimated_label) % self.tr(name) if is_estimated else name, dt

holidays/groups/persian.py

@@ -11,9 +11,9 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from datetime import timedelta as td
 from typing import Optional
 
+from holidays.calendars.gregorian import _timedelta
 from holidays.calendars.persian import _Persian
 
 
@@ -142,5 +142,5 @@ class PersianCalendarHolidays:
         if dt is None:
             return None
         if days_delta != 0:
-            dt += td(days=days_delta)
+            dt = _timedelta(dt, days_delta)
         return self._add_holiday(name, dt)

holidays/helpers.py

@@ -24,13 +24,19 @@ def _normalize_arguments(cls, value):
         A set created from `value` argument.
 
     """
+    if value is None:
+        return set()
+
     if isinstance(value, cls):
         return {value}
 
-    return set(value) if value is not None else set()
+    try:
+        return {v if isinstance(v, cls) else cls(v) for v in value}
+    except TypeError:  # non-iterable
+        return {value if isinstance(value, cls) else cls(value)}
 
 
-def _normalize_tuple(data):
+def _normalize_tuple(value):
     """Normalize tuple.
 
     :param data:
@@ -40,4 +46,4 @@ def _normalize_tuple(data):
         An unchanged object for tuple of tuples, e.g., ((JAN, 10), (DEC, 31)).
         An object put into a tuple otherwise, e.g., ((JAN, 10),).
     """
-    return data if not data or isinstance(data[0], tuple) else (data,)
+    return value if not value or isinstance(value[0], tuple) else (value,)

holidays/holiday_base.py

@@ -13,7 +13,6 @@
 __all__ = ("DateLike", "HolidayBase", "HolidaySum")
 
 import copy
-import re
 import warnings
 from calendar import isleap
 from datetime import date, datetime, timedelta, timezone
@@ -24,7 +23,6 @@ from typing import Any, Dict, Iterable, List, Optional, Set, Tuple, Union, cast
 
 from dateutil.parser import parse
 
-from holidays.calendars import gregorian
 from holidays.calendars.gregorian import (
     MON,
     TUE,
@@ -33,8 +31,12 @@ from holidays.calendars.gregorian import (
     FRI,
     SAT,
     SUN,
+    _timedelta,
     _get_nth_weekday_from,
     _get_nth_weekday_of_month,
+    DAYS,
+    MONTHS,
+    WEEKDAYS,
 )
 from holidays.constants import HOLIDAY_NAME_DELIMITER, PUBLIC
 from holidays.helpers import _normalize_arguments, _normalize_tuple
@@ -230,6 +232,8 @@ class HolidayBase(Dict[date, str]):
     ones."""
     weekend: Set[int] = {SAT, SUN}
     """Country weekend days."""
+    weekend_workdays: Set[date] = set()
+    """Working days moved to weekends."""
     default_category: str = PUBLIC
     """The entity category used by default."""
     default_language: Optional[str] = None
@@ -353,6 +357,7 @@ class HolidayBase(Dict[date, str]):
         self.language = language.lower() if language else None
         self.observed = observed
         self.subdiv = subdiv
+        self.weekend_workdays = set()
 
         supported_languages = set(self.supported_languages)
         self.tr = (
@@ -427,77 +432,107 @@ class HolidayBase(Dict[date, str]):
         except AttributeError as e:
             # This part is responsible for _add_holiday_* syntactic sugar support.
             add_holiday_prefix = "_add_holiday_"
-            # Raise early if prefix doesn't match to avoid regex checks.
+            # Raise early if prefix doesn't match to avoid patterns checks.
             if name[: len(add_holiday_prefix)] != add_holiday_prefix:
                 raise e
 
+            tokens = name.split("_")
+
             # Handle <month> <day> patterns (e.g., _add_holiday_jun_15()).
-            month_day = re.match(r"_add_holiday_(\w{3})_(\d{1,2})", name)
-            if month_day:
-                month, day = month_day.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    date(self._year, getattr(gregorian, month.upper()), int(day)),
-                )
+            if len(tokens) == 5:
+                *_, month, day = tokens
+                if month in MONTHS and day in DAYS:
+                    return lambda name: self._add_holiday(
+                        name,
+                        date(self._year, MONTHS[month], int(day)),
+                    )
 
-            # Handle <last/nth> <weekday> of <month> patterns (e.g.,
-            # _add_holiday_last_mon_of_aug() or _add_holiday_3rd_fri_of_aug()).
-            nth_weekday_of_month = re.match(
-                r"_add_holiday_(last|\d\w{2})_(\w{3})_of_(\w{3})", name
-            )
-            if nth_weekday_of_month:
-                number, weekday, month = nth_weekday_of_month.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    _get_nth_weekday_of_month(
-                        -1 if number == "last" else +int(re.sub(r"\D", "", number)),
-                        getattr(gregorian, weekday.upper()),
-                        getattr(gregorian, month.upper()),
-                        self._year,
-                    ),
-                )
+            elif len(tokens) == 7:
+                # Handle <last/nth> <weekday> of <month> patterns (e.g.,
+                # _add_holiday_last_mon_of_aug() or _add_holiday_3rd_fri_of_aug()).
+                *_, number, weekday, of, month = tokens
+                if (
+                    of == "of"
+                    and (number == "last" or number[0].isdigit())
+                    and month in MONTHS
+                    and weekday in WEEKDAYS
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        _get_nth_weekday_of_month(
+                            -1 if number == "last" else int(number[0]),
+                            WEEKDAYS[weekday],
+                            MONTHS[month],
+                            self._year,
+                        ),
+                    )
+
+                # Handle <n> days <past/prior> easter patterns (e.g.,
+                # _add_holiday_8_days_past_easter() or
+                # _add_holiday_5_days_prior_easter()).
+                *_, days, unit, delta_direction, easter = tokens
+                if (
+                    unit in {"day", "days"}
+                    and delta_direction in {"past", "prior"}
+                    and easter == "easter"
+                    and len(days) < 3
+                    and days.isdigit()
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        _timedelta(
+                            self._easter_sunday,
+                            +int(days) if delta_direction == "past" else -int(days),
+                        ),
+                    )
 
             # Handle <n> day(s) <past/prior> <last/<nth> <weekday> of <month> patterns (e.g.,
             # _add_holiday_1_day_past_1st_fri_of_aug() or
             # _add_holiday_5_days_prior_last_fri_of_aug()).
-            nth_weekday_of_month_with_delta = re.match(
-                r"_add_holiday_(\d{1,2})_days?_(past|prior)_(last|\d\w{2})_(\w{3})_of_(\w{3})",
-                name,
-            )
-            if nth_weekday_of_month_with_delta:
-                (
-                    days,
-                    delta_direction,
-                    number,
-                    weekday,
-                    month,
-                ) = nth_weekday_of_month_with_delta.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    _get_nth_weekday_of_month(
-                        -1 if number == "last" else +int(re.sub(r"\D", "", number)),
-                        getattr(gregorian, weekday.upper()),
-                        getattr(gregorian, month.upper()),
-                        self._year,
+            elif len(tokens) == 10:
+                *_, days, unit, delta_direction, number, weekday, of, month = tokens
+                if (
+                    unit in {"day", "days"}
+                    and delta_direction in {"past", "prior"}
+                    and of == "of"
+                    and len(days) < 3
+                    and days.isdigit()
+                    and (number == "last" or number[0].isdigit())
+                    and month in MONTHS
+                    and weekday in WEEKDAYS
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        _timedelta(
+                            _get_nth_weekday_of_month(
+                                -1 if number == "last" else int(number[0]),
+                                WEEKDAYS[weekday],
+                                MONTHS[month],
+                                self._year,
+                            ),
+                            +int(days) if delta_direction == "past" else -int(days),
+                        ),
                     )
-                    + timedelta(days=+int(days) if delta_direction == "past" else -int(days)),
-                )
 
             # Handle <nth> <weekday> <before/from> <month> <day> patterns (e.g.,
             # _add_holiday_1st_mon_before_jun_15() or _add_holiday_1st_mon_from_jun_15()).
-            nth_weekday_from = re.match(
-                r"_add_holiday_(\d{1,2})\w{2}_(\w+)_(before|from)_(\w{3})_(\d{1,2})", name
-            )
-            if nth_weekday_from:
-                number, weekday, date_direction, month, day = nth_weekday_from.groups()
-                return lambda name: self._add_holiday(
-                    name,
-                    _get_nth_weekday_from(
-                        -int(number) if date_direction == "before" else +int(number),
-                        getattr(gregorian, weekday.upper()),
-                        date(self._year, getattr(gregorian, month.upper()), int(day)),
-                    ),
-                )
+            elif len(tokens) == 8:
+                *_, number, weekday, date_direction, month, day = tokens
+                if (
+                    date_direction in {"before", "from"}
+                    and number[0].isdigit()
+                    and month in MONTHS
+                    and weekday in WEEKDAYS
+                    and day in DAYS
+                ):
+                    return lambda name: self._add_holiday(
+                        name,
+                        _get_nth_weekday_from(
+                            -int(number[0]) if date_direction == "before" else +int(number[0]),
+                            WEEKDAYS[weekday],
+                            date(self._year, MONTHS[month], int(day)),
+                        ),
+                    )
 
             raise e  # No match.
 
@@ -527,7 +562,7 @@ class HolidayBase(Dict[date, str]):
 
             days_in_range = []
             for delta_days in range(0, date_diff.days, step):
-                day = start + timedelta(days=delta_days)
+                day = _timedelta(start, delta_days)
                 if day in self:
                     days_in_range.append(day)
 
@@ -676,9 +711,13 @@ class HolidayBase(Dict[date, str]):
             .lower()
         )
 
-    @cached_property
+    @property
     def _sorted_categories(self):
-        return sorted(self.categories)
+        return (
+            [self.default_category] + sorted(self.categories - {self.default_category})
+            if self.default_category in self.categories
+            else sorted(self.categories)
+        )
 
     @classmethod
     def get_subdivision_aliases(cls) -> Dict[str, List]:
@@ -724,14 +763,14 @@ class HolidayBase(Dict[date, str]):
                     )
                 else:  # Substituted holidays.
                     to_month, to_day, from_month, from_day, *optional = data
+                    from_date = date(optional[0] if optional else self._year, from_month, from_day)
                     self._add_holiday(
                         self.tr(self.substituted_label)
-                        % date(
-                            optional[0] if optional else self._year, from_month, from_day
-                        ).strftime(self.tr(self.substituted_date_format)),
+                        % from_date.strftime(self.tr(self.substituted_date_format)),
                         to_month,
                         to_day,
                     )
+                    self.weekend_workdays.add(from_date)
 
     def _check_weekday(self, weekday: int, *args) -> bool:
         """
@@ -922,6 +961,34 @@ class HolidayBase(Dict[date, str]):
 
         raise AttributeError(f"Unknown lookup type: {lookup}")
 
+    def get_nth_workday(self, key: DateLike, n: int) -> date:
+        """Return n-th working day from provided date (if n is positive)
+        or n-th working day before provided date (if n is negative).
+        """
+        direction = +1 if n > 0 else -1
+        dt = self.__keytransform__(key)
+        for _ in range(abs(n)):
+            dt = _timedelta(dt, direction)
+            while not self.is_workday(dt):
+                dt = _timedelta(dt, direction)
+        return dt
+
+    def get_workdays_number(self, key1: DateLike, key2: DateLike) -> int:
+        """Return the number of working days between two dates (not including the start date)."""
+        dt1 = self.__keytransform__(key1)
+        dt2 = self.__keytransform__(key2)
+        if dt1 == dt2:
+            return 0
+        if dt1 > dt2:
+            dt1, dt2 = dt2, dt1
+
+        return sum(self.is_workday(_timedelta(dt1, n)) for n in range(1, (dt2 - dt1).days + 1))
+
+    def is_workday(self, key: DateLike) -> bool:
+        """Return True if date is a working day (not a holiday or a weekend)."""
+        dt = self.__keytransform__(key)
+        return dt in self.weekend_workdays if self._is_weekend(dt) else dt not in self
+
     def pop(self, key: DateLike, default: Union[str, Any] = None) -> Union[str, Any]:
         """If date is a holiday, remove it and return its date, else return
         default.