holidays 0.48__py3-none-any.whl → 0.50__py3-none-any.whl

holidays/countries/israel.py

@@ -10,10 +10,10 @@
 #  Website: https://github.com/vacanza/python-holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import timedelta as td
 from gettext import gettext as tr
 
 from holidays.calendars import _HebrewLunisolar
+from holidays.calendars.gregorian import _timedelta
 from holidays.calendars.hebrew import (
     HANUKKAH,
     INDEPENDENCE_DAY,
@@ -73,7 +73,7 @@ class Israel(ObservedHolidayBase):
         name = tr("ראש השנה")
         rosh_hashanah_dt = self._get_holiday(ROSH_HASHANAH)
         self._add_holiday(name, rosh_hashanah_dt)
-        self._add_holiday(name, rosh_hashanah_dt + td(days=+1))
+        self._add_holiday(name, _timedelta(rosh_hashanah_dt, +1))
 
         # Yom Kippur (Day of Atonement).
         self._add_holiday(tr("יום כיפור"), self._get_holiday(YOM_KIPPUR))
@@ -83,13 +83,13 @@ class Israel(ObservedHolidayBase):
         sukkot_dt = self._get_holiday(SUKKOT)
         self._add_holiday(name, sukkot_dt)
         # Simchat Torah / Shemini Atzeret.
-        self._add_holiday(tr("שמחת תורה/שמיני עצרת"), sukkot_dt + td(days=+7))
+        self._add_holiday(tr("שמחת תורה/שמיני עצרת"), _timedelta(sukkot_dt, +7))
 
         passover_dt = self._get_holiday(PASSOVER)
         # Pesach (Passover).
         self._add_holiday(tr("פסח"), passover_dt)
         # Shvi'i shel Pesach (Seventh day of Passover)
-        self._add_holiday(tr("שביעי של פסח"), passover_dt + td(days=+6))
+        self._add_holiday(tr("שביעי של פסח"), _timedelta(passover_dt, +6))
 
         # Yom Ha-Atzmaut (Independence Day).
         name = tr("יום העצמאות")
@@ -114,11 +114,11 @@ class Israel(ObservedHolidayBase):
         sukkot_dt = self._get_holiday(SUKKOT)
         for offset in range(1, 6):
             # Chol HaMoed Sukkot (Feast of Tabernacles holiday).
-            self._add_holiday(tr("חול המועד סוכות"), sukkot_dt + td(days=offset))
+            self._add_holiday(tr("חול המועד סוכות"), _timedelta(sukkot_dt, offset))
 
         if self._year >= 2008:
             # Sigd.
-            self._add_holiday(tr("סיגד"), self._get_holiday(YOM_KIPPUR) + td(days=+49))
+            self._add_holiday(tr("סיגד"), _timedelta(self._get_holiday(YOM_KIPPUR), +49))
 
         # Purim.
         self._add_holiday(tr("פורים"), self._get_holiday(PURIM))
@@ -126,12 +126,12 @@ class Israel(ObservedHolidayBase):
         passover_dt = self._get_holiday(PASSOVER)
         for offset in range(1, 6):
             # Chol HaMoed Pesach (Passover holiday).
-            self._add_holiday(tr("חול המועד פסח"), passover_dt + td(days=offset))
+            self._add_holiday(tr("חול המועד פסח"), _timedelta(passover_dt, offset))
 
         if self._year >= 1963:
             # Yom Hazikaron (Fallen Soldiers and Victims of Terrorism Remembrance Day).
             name = tr("יום הזיכרון לחללי מערכות ישראל ונפגעי פעולות האיבה")
-            remembrance_day_dt = self._get_holiday(INDEPENDENCE_DAY) + td(days=-1)
+            remembrance_day_dt = _timedelta(self._get_holiday(INDEPENDENCE_DAY), -1)
             rule = THU_TO_PREV_WED + FRI_TO_PREV_WED
             if self._year >= 2004:
                 rule += SUN_TO_NEXT_MON
@@ -141,7 +141,7 @@ class Israel(ObservedHolidayBase):
 
         if self._year >= 1998:
             # Yom Yerushalayim (Jerusalem Day).
-            self._add_holiday(tr("יום ירושלים"), self._get_holiday(LAG_BAOMER) + td(days=+10))
+            self._add_holiday(tr("יום ירושלים"), _timedelta(self._get_holiday(LAG_BAOMER), +10))
 
         # Tisha B'Av (Tisha B'Av, fast).
         name = tr("תשעה באב")
@@ -160,18 +160,18 @@ class Israel(ObservedHolidayBase):
         sukkot_dt = self._get_holiday(SUKKOT)
         for offset in range(1, 6):
             # Chol HaMoed Sukkot (Feast of Tabernacles holiday).
-            self._add_holiday(tr("חול המועד סוכות"), sukkot_dt + td(days=offset))
+            self._add_holiday(tr("חול המועד סוכות"), _timedelta(sukkot_dt, offset))
 
         for year in (self._year - 1, self._year):
             hanukkah_dt = _HebrewLunisolar._get_holiday(HANUKKAH, year)
             for offset in range(8):
                 # Hanukkah.
-                self._add_holiday(tr("חנוכה"), hanukkah_dt + td(days=offset))
+                self._add_holiday(tr("חנוכה"), _timedelta(hanukkah_dt, offset))
 
         # Ta`anit Ester (Fast of Esther).
         name = tr("תענית אסתר")
         purim_dt = self._get_holiday(PURIM)
-        taanit_ester_dt = purim_dt + td(days=-1)
+        taanit_ester_dt = _timedelta(purim_dt, -1)
         is_observed, _ = self._add_observed(taanit_ester_dt, name, SAT_TO_PREV_THU)
         if not is_observed:
             self._add_holiday(name, taanit_ester_dt)
@@ -182,7 +182,7 @@ class Israel(ObservedHolidayBase):
         passover_dt = self._get_holiday(PASSOVER)
         for offset in range(1, 6):
             # Chol HaMoed Pesach (Passover holiday).
-            self._add_holiday(tr("חול המועד פסח"), passover_dt + td(days=offset))
+            self._add_holiday(tr("חול המועד פסח"), _timedelta(passover_dt, offset))
 
         # Lag Ba'omer (Lag BaOmer).
         self._add_holiday(tr('ל"ג בעומר'), self._get_holiday(LAG_BAOMER))

holidays/countries/italy.py

@@ -10,131 +10,128 @@
 #  Website: https://github.com/vacanza/python-holidays
 #  License: MIT (see LICENSE file)
 
-from datetime import timedelta as td
-
-from holidays.groups import ChristianHolidays, InternationalHolidays
+from holidays.calendars.gregorian import MAR
+from holidays.groups import ChristianHolidays, InternationalHolidays, StaticHolidays
 from holidays.holiday_base import HolidayBase
 
 
-class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
+class Italy(HolidayBase, ChristianHolidays, InternationalHolidays, StaticHolidays):
+    """
+    References:
+        - https://en.wikipedia.org/wiki/Public_holidays_in_Italy
+        - `Provinces holidays <https://it.wikipedia.org/wiki/Santi_patroni_cattolici_delle_citt%C3%A0_capoluogo_di_provincia_italiane>`_  # noqa: E501
+    """
+
     country = "IT"
-    # Reference: https://it.wikipedia.org/wiki/Province_d%27Italia
-    # Please maintain in alphabetical order for easy updating in the future
-    # The alphabetical order is except cities of provinces with multiple head
-    # cities that directly follows the main province id like BT, Barletta,
-    # Andria, Trani, for easily grouping them.
-    # In that case if you use the 2 char id you'll take the first Santo
-    # Patrono defined. If you want one specific you'll have to use
-    # the full name of the city like "Andria" instead of "BT".
     subdivisions = (
         # Provinces.
-        "AG",
-        "AL",
-        "AN",
-        "AO",
-        "AP",
-        "AQ",
-        "AR",
-        "AT",
-        "AV",
-        "BA",
-        "BG",
-        "BI",
-        "BL",
-        "BN",
-        "BO",
-        "BR",
-        "BS",
-        "BT",
-        "BZ",
-        "CA",
-        "CB",
-        "CE",
-        "CH",
-        "CL",
-        "CN",
-        "CO",
-        "CR",
-        "CS",
-        "CT",
-        "CZ",
-        "EN",
-        "FC",
-        "FE",
-        "FG",
-        "FI",
-        "FM",
-        "FR",
-        "GE",
-        "GO",
-        "GR",
-        "IM",
-        "IS",
-        "KR",
-        "LC",
-        "LE",
-        "LI",
-        "LO",
-        "LT",
-        "LU",
-        "MB",
-        "MC",
-        "ME",
-        "MI",
-        "MN",
-        "MO",
-        "MS",
-        "MT",
-        "NA",
-        "NO",
-        "NU",
-        "OR",
-        "PA",
-        "PC",
-        "PD",
-        "PE",
-        "PG",
-        "PI",
-        "PN",
-        "PO",
-        "PR",
-        "PT",
-        "PU",
-        "PV",
-        "PZ",
-        "RA",
-        "RC",
-        "RE",
-        "RG",
-        "RI",
-        "RM",
-        "RN",
-        "RO",
-        "SA",
-        "SI",
-        "SO",
-        "SP",
-        "SR",
-        "SS",
-        "SU",
-        "SV",
-        "TA",
-        "TE",
-        "TN",
-        "TO",
-        "TP",
-        "TR",
-        "TS",
-        "TV",
-        "UD",
-        "VA",
-        "VB",
-        "VC",
-        "VE",
-        "VI",
-        "VR",
-        "VT",
-        "VV",
+        "AG",  # Agrigento.
+        "AL",  # Alessandria.
+        "AN",  # Ancona.
+        "AO",  # Aosta (deprecated).
+        "AP",  # Ascoli Piceno.
+        "AQ",  # L'Aquila.
+        "AR",  # Arezzo.
+        "AT",  # Asti.
+        "AV",  # Avellino.
+        "BA",  # Bari.
+        "BG",  # Bergamo.
+        "BI",  # Biella.
+        "BL",  # Belluno.
+        "BN",  # Benevento.
+        "BO",  # Bologna.
+        "BR",  # Brindisi.
+        "BS",  # Brescia.
+        "BT",  # Barletta-Andria-Trani.
+        "BZ",  # Bolzano.
+        "CA",  # Cagliari.
+        "CB",  # Campobasso.
+        "CE",  # Caserta.
+        "CH",  # Chieti.
+        "CL",  # Caltanissetta.
+        "CN",  # Cuneo.
+        "CO",  # Como.
+        "CR",  # Cremona.
+        "CS",  # Cosenza.
+        "CT",  # Catania.
+        "CZ",  # Catanzaro.
+        "EN",  # Enna.
+        "FC",  # Forlì-Cesena.
+        "FE",  # Ferrara.
+        "FG",  # Foggia.
+        "FI",  # Firenze.
+        "FM",  # Fermo.
+        "FR",  # Frosinone.
+        "GE",  # Genova.
+        "GO",  # Gorizia.
+        "GR",  # Grosseto.
+        "IM",  # Imperia.
+        "IS",  # Isernia.
+        "KR",  # Crotone.
+        "LC",  # Lecco.
+        "LE",  # Lecce.
+        "LI",  # Livorno.
+        "LO",  # Lodi.
+        "LT",  # Latina.
+        "LU",  # Lucca.
+        "MB",  # Monza e Brianza.
+        "MC",  # Macerata.
+        "ME",  # Messina.
+        "MI",  # Milano.
+        "MN",  # Mantova.
+        "MO",  # Modena.
+        "MS",  # Massa-Carrara.
+        "MT",  # Matera.
+        "NA",  # Napoli.
+        "NO",  # Novara.
+        "NU",  # Nuoro.
+        "OR",  # Oristano.
+        "PA",  # Palermo.
+        "PC",  # Piacenza.
+        "PD",  # Padova.
+        "PE",  # Pescara.
+        "PG",  # Perugia.
+        "PI",  # Pisa.
+        "PN",  # Pordenone.
+        "PO",  # Prato.
+        "PR",  # Parma.
+        "PT",  # Pistoia.
+        "PU",  # Pesaro e Urbino.
+        "PV",  # Pavia.
+        "PZ",  # Potenza.
+        "RA",  # Ravenna.
+        "RC",  # Reggio Calabria.
+        "RE",  # Reggio Emilia.
+        "RG",  # Ragusa.
+        "RI",  # Rieti.
+        "RM",  # Roma.
+        "RN",  # Rimini.
+        "RO",  # Rovigo.
+        "SA",  # Salerno.
+        "SI",  # Siena.
+        "SO",  # Sondrio.
+        "SP",  # La Spezia.
+        "SR",  # Siracusa.
+        "SS",  # Sassari.
+        "SU",  # Sud Sardegna.
+        "SV",  # Savona.
+        "TA",  # Taranto.
+        "TE",  # Teramo.
+        "TN",  # Trento.
+        "TO",  # Torino.
+        "TP",  # Trapani.
+        "TR",  # Terni.
+        "TS",  # Trieste.
+        "TV",  # Treviso.
+        "UD",  # Udine.
+        "VA",  # Varese.
+        "VB",  # Verbano-Cusio-Ossola.
+        "VC",  # Vercelli.
+        "VE",  # Venezia.
+        "VI",  # Vicenza.
+        "VR",  # Verona.
+        "VT",  # Viterbo.
+        "VV",  # Vibo Valentia.
         # Cities.
         "Andria",
         "Barletta",
@@ -150,6 +147,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
         InternationalHolidays.__init__(self)
+        StaticHolidays.__init__(self, cls=ItalyStaticHolidays)
         super().__init__(*args, **kwargs)
 
     def _populate_public_holidays(self):
@@ -159,6 +157,10 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         # Epiphany.
         self._add_epiphany_day("Epifania del Signore")
 
+        if self._year <= 1976:
+            # Saint Joseph's Day.
+            self._add_saint_josephs_day("San Giuseppe")
+
         # Easter Sunday.
         self._add_easter_sunday("Pasqua di Resurrezione")
 
@@ -176,27 +178,39 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
             # Republic Day.
             self._add_holiday_jun_2("Festa della Repubblica")
 
+        if self._year <= 1976:
+            # Ascension Day.
+            self._add_ascension_thursday("Ascensione Nostro Signore")
+
+            # Saints Peter and Paul.
+            self._add_saints_peter_and_paul_day("Santi Pietro e Paolo")
+
+            # Corpus Christi.
+            self._add_corpus_christi_day("Corpus Domini")
+
         # Assumption Of Mary Day.
         self._add_assumption_of_mary_day("Assunzione della Vergine")
 
         # All Saints' Day.
         self._add_all_saints_day("Tutti i Santi")
 
-        # Immaculate Conception Day.
+        if self._year <= 1976:
+            # National Unity and Armed Forces Day.
+            self._add_holiday_nov_4("Giornata dell'Unità Nazionale e delle Forze Armate")
+
+        # Immaculate Conception.
         self._add_immaculate_conception_day("Immacolata Concezione")
 
         # Christmas Day.
         self._add_christmas_day("Natale")
 
-        self._add_christmas_day_two("Santo Stefano")
+        if self._year >= 1947:
+            # Saint Stephen's Day.
+            self._add_christmas_day_two("Santo Stefano")
 
         if self.subdiv == "Forlì":
             self._populate_subdiv_forli_public_holidays()
 
-    # Provinces holidays.
-    # https://it.wikipedia.org/wiki/Santi_patroni_cattolici_delle_citt%C3%A0_capoluogo_di_provincia_italiane
-    # Please maintain in alphabetical order for easy updating in the future.
-
     def _populate_subdiv_ag_public_holidays(self):
         self._add_holiday_feb_25("San Gerlando")
 
@@ -243,11 +257,12 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_oct_4("San Petronio")
 
     def _populate_subdiv_br_public_holidays(self):
-        self._add_holiday_1st_sun_of_sep("San Teodoro d'Amasea e San Lorenzo da Brindisi")
+        self._add_holiday_1st_sun_of_sep("San Lorenzo da Brindisi")
 
     def _populate_subdiv_bs_public_holidays(self):
         self._add_holiday_feb_15("Santi Faustino e Giovita")
 
+    # Barletta-Andria-Trani
     def _populate_subdiv_bt_public_holidays(self):
         self._add_holiday_may_3("San Nicola Pellegrino")
         self._add_holiday_3rd_sun_of_sep("San Riccardo di Andria")
@@ -293,6 +308,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
     def _populate_subdiv_en_public_holidays(self):
         self._add_holiday_jul_2("Madonna della Visitazione")
 
+    # Forlì-Cesena
     def _populate_subdiv_fc_public_holidays(self):
         self._add_holiday_feb_4("Madonna del Fuoco")
         self._add_saint_johns_day("San Giovanni Battista")
@@ -307,8 +323,8 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_saint_johns_day("San Giovanni Battista")
 
     def _populate_subdiv_fm_public_holidays(self):
-        aug_15 = self._add_assumption_of_mary_day("Maria Santissima Assunta")
-        self._add_holiday("Maria Santissima Assunta", aug_15 + td(days=+1))
+        self._add_assumption_of_mary_day("Maria Santissima Assunta")
+        self._add_holiday_aug_16("Maria Santissima Assunta")
 
     def _populate_subdiv_fr_public_holidays(self):
         self._add_holiday_jun_20("San Silverio")
@@ -344,7 +360,8 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_jan_19("San Bassiano")
 
     def _populate_subdiv_lt_public_holidays(self):
-        self._add_holiday_apr_25("San Marco evangelista")
+        self._add_holiday_apr_25("San Marco Evangelista")
+        self._add_holiday_jul_6("Santa Maria Goretti")
 
     def _populate_subdiv_lu_public_holidays(self):
         self._add_holiday_jul_12("San Paolino di Lucca")
@@ -386,7 +403,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_feb_13("Sant'Archelao")
 
     def _populate_subdiv_pa_public_holidays(self):
-        self._add_holiday_jul_15("San Giovanni")
+        self._add_holiday_jul_15("Santa Rosalia")
 
     def _populate_subdiv_pc_public_holidays(self):
         self._add_holiday_jul_4("Sant'Antonino di Piacenza")
@@ -398,7 +415,8 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_oct_10("San Cetteo")
 
     def _populate_subdiv_pg_public_holidays(self):
-        self._add_holiday_jan_29("Sant'Ercolano e San Lorenzo")
+        self._add_holiday_aug_11("Santa Chiara d'Assisi")
+        self._add_holiday_oct_4("San Francesco d'Assisi")
 
     def _populate_subdiv_pi_public_holidays(self):
         self._add_holiday_jun_17("San Ranieri")
@@ -416,6 +434,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
     def _populate_subdiv_pt_public_holidays(self):
         self._add_saint_james_day("San Jacopo")
 
+    # Pesaro e Urbino
     def _populate_subdiv_pu_public_holidays(self):
         self._add_holiday_jun_1("San Crescentino")
         self._add_holiday_sep_24("San Terenzio di Pesaro")
@@ -436,7 +455,8 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_nov_24("San Prospero Vescovo")
 
     def _populate_subdiv_rg_public_holidays(self):
-        self._add_saint_georges_day("San Giorgio")
+        self._add_saint_georges_day("San Giorgio Martire")
+        self._add_holiday_aug_29("San Giovanni Battista")
 
     def _populate_subdiv_ri_public_holidays(self):
         self._add_holiday_dec_4("Santa Barbara")
@@ -469,6 +489,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_dec_6("San Nicola")
 
     def _populate_subdiv_su_public_holidays(self):
+        # Carbonia.
         self._add_holiday_4_days_past_2nd_sun_of_may("San Ponziano")
 
     def _populate_subdiv_sv_public_holidays(self):
@@ -514,7 +535,7 @@ class Italy(HolidayBase, ChristianHolidays, InternationalHolidays):
         self._add_holiday_apr_25("San Marco Evangelista")
 
     def _populate_subdiv_vi_public_holidays(self):
-        self._add_holiday_apr_25("San Marco")
+        self._add_nativity_of_mary_day("Madonna di Monte Berico")
 
     def _populate_subdiv_vr_public_holidays(self):
         self._add_holiday_may_21("San Zeno")
@@ -553,3 +574,12 @@ class IT(Italy):
 
 class ITA(Italy):
     pass
+
+
+class ItalyStaticHolidays:
+    # Anniversary of the Unification of Italy.
+    anniversary_of_unification = "Anniversario dell'Unità d'Italia"
+    special_public_holidays = {
+        1961: (MAR, 17, anniversary_of_unification),
+        2011: (MAR, 17, anniversary_of_unification),
+    }

holidays/countries/japan.py

@@ -11,18 +11,28 @@
 #  License: MIT (see LICENSE file)
 
 from datetime import date
-from datetime import timedelta as td
 from gettext import gettext as tr
-from typing import Tuple
-
-from holidays.calendars.gregorian import FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP, OCT, NOV
+from typing import Set, Tuple
+
+from holidays.calendars.gregorian import (
+    FEB,
+    MAR,
+    APR,
+    MAY,
+    JUN,
+    JUL,
+    AUG,
+    SEP,
+    OCT,
+    NOV,
+    _timedelta,
+)
 from holidays.constants import BANK, PUBLIC
 from holidays.groups import InternationalHolidays, StaticHolidays
-from holidays.helpers import _normalize_tuple
-from holidays.holiday_base import HolidayBase
+from holidays.observed_holiday_base import ObservedHolidayBase, SUN_TO_NEXT_WORKDAY
 
 
-class Japan(HolidayBase, InternationalHolidays, StaticHolidays):
+class Japan(ObservedHolidayBase, InternationalHolidays, StaticHolidays):
     """
     References:
 
@@ -38,8 +48,33 @@ class Japan(HolidayBase, InternationalHolidays, StaticHolidays):
     def __init__(self, *args, **kwargs) -> None:
         InternationalHolidays.__init__(self)
         StaticHolidays.__init__(self, cls=JapanStaticHolidays)
+        kwargs.setdefault("observed_rule", SUN_TO_NEXT_WORKDAY)
         super().__init__(*args, **kwargs)
 
+    def _populate_observed(self, dts: Set[date]) -> None:
+        # When a national holiday falls on Sunday, next working day
+        # shall become a public holiday (振替休日) - substitute holidays.
+        for dt in sorted(dts):
+            is_observed, dt_observed = self._add_observed(
+                dt,
+                # Substitute Holiday.
+                name=tr("振替休日"),
+                show_observed_label=False,
+            )
+            if is_observed:
+                dts.add(dt_observed)  # type: ignore[arg-type]
+
+        # A weekday between national holidays becomes
+        # a holiday too (国民の休日) - national holidays.
+        for dt in dts:
+            if _timedelta(dt, +2) not in dts:
+                continue
+            dt_observed = _timedelta(dt, +1)
+            if self._is_sunday(dt_observed) or dt_observed in dts:
+                continue
+            # National Holiday.
+            self._add_holiday(tr("国民の休日"), dt_observed)
+
     def _populate_public_holidays(self):
         if self._year < 1949 or self._year > 2099:
             raise NotImplementedError
@@ -161,32 +196,7 @@ class Japan(HolidayBase, InternationalHolidays, StaticHolidays):
             dts_observed.add(self._add_holiday_dec_23(tr("天皇誕生日")))
 
         if self.observed:
-            for month, day, _ in _normalize_tuple(
-                self.special_public_holidays.get(self._year, ())
-            ):
-                dts_observed.add(date(self._year, month, day))
-
-            # When a national holiday falls on Sunday, next working day
-            # shall become a public holiday (振替休日) - substitute holidays.
-            for dt in dts_observed.copy():
-                if not self._is_sunday(dt):
-                    continue
-                dt_observed = dt + td(days=+1)
-                while dt_observed in dts_observed:
-                    dt_observed += td(days=+1)
-                # Substitute Holiday.
-                dts_observed.add(self._add_holiday(tr("振替休日"), dt_observed))
-
-            # A weekday between national holidays becomes
-            # a holiday too (国民の休日) - citizens' holidays.
-            for dt in dts_observed:
-                if dt + td(days=+2) not in dts_observed:
-                    continue
-                dt_observed = dt + td(days=+1)
-                if self._is_sunday(dt_observed) or dt_observed in dts_observed:
-                    continue
-                # National Holiday.
-                self._add_holiday(tr("国民の休日"), dt_observed)
+            self._populate_observed(dts_observed)
 
     def _populate_bank_holidays(self):
         if self._year < 1949 or self._year > 2099:
@@ -235,6 +245,8 @@ class JPN(Japan):
 
 
 class JapanStaticHolidays:
+    national_holiday = tr("国民の休日")
+
     special_public_holidays = {
         1959: (APR, 10, tr("結婚の儀")),  # The Crown Prince marriage ceremony.
         1989: (FEB, 24, tr("大喪の礼")),  # State Funeral of Emperor Shōwa.
@@ -245,3 +257,10 @@ class JapanStaticHolidays:
             (OCT, 22, tr("即位礼正殿の儀が行われる日")),  # Enthronement ceremony.
         ),
     }
+
+    special_public_holidays_observed = {
+        2019: (
+            (APR, 30, national_holiday),
+            (MAY, 2, national_holiday),
+        ),
+    }