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

holidays/countries/thailand.py

@@ -13,19 +13,16 @@ from datetime import date
 from datetime import timedelta as td
 from gettext import gettext as tr
 
-from holidays.calendars import _ThaiLunisolar
-from holidays.constants import JAN, FEB, MAR, APR, MAY, JUN, JUL, AUG, SEP
-from holidays.constants import OCT, NOV, DEC
+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 InternationalHolidays
+from holidays.holiday_groups import InternationalHolidays, ThaiCalendarHolidays
 
 
-class Thailand(HolidayBase, InternationalHolidays):
+class Thailand(HolidayBase, InternationalHolidays, ThaiCalendarHolidays):
     """
     A subclass of :py:class:`HolidayBase` representing public holidays
     in Thailand. (Based on South Korean and Singaporean Implementation)
 
-
     References:
 
     - Based on: https://en.wikipedia.org/wiki/Public_holidays_in_Thailand
@@ -125,20 +122,13 @@ class Thailand(HolidayBase, InternationalHolidays):
     # Special Cases.
 
     rama_ix_golden_jubilee = tr("พระราชพิธีกาญจนาภิเษก พ.ศ. 2539")
-    rama_ix_sixty_accession = tr(
-        "พระราชพิธีฉลองสิริราชสมบัติครบ 60 ปี พ.ศ. 2549"
-    )
+    rama_ix_sixty_accession = tr("พระราชพิธีฉลองสิริราชสมบัติครบ 60 ปี พ.ศ. 2549")
     thai_military_emergency_lockdown = tr("วันหยุดพิเศษ (คมช.)")
     thai_political_emergency_lockdown = tr("วันหยุดพิเศษ (การเมือง)")
-    thai_flood_2011_emergency_lockdown = tr(
-        "วันหยุดพิเศษ (มหาอุทกภัย พ.ศ. 2554)"
-    )
-    rama_ix_mourning = tr(
-        "วันหยุดพิเศษ (ร่วมถวายอาลัย ส่งดวงพระวิญญาณพระบรมศพ)"
-    )
+    thai_flood_2011_emergency_lockdown = tr("วันหยุดพิเศษ (มหาอุทกภัย พ.ศ. 2554)")
+    rama_ix_mourning = tr("วันหยุดพิเศษ (ร่วมถวายอาลัย ส่งดวงพระวิญญาณพระบรมศพ)")
     rama_ix_cremation = tr(
-        "วันพระราชพิธีถวายพระเพลิงพระบรมศพ"
-        "พระบาทสมเด็จพระปรมินทรมหาภูมิพลอดุลยเดช"
+        "วันพระราชพิธีถวายพระเพลิงพระบรมศพพระบาทสมเด็จพระปรมินทรมหาภูมิพลอดุลยเดช"
     )
     rama_x_coronation_celebrations = tr(
         "พระราชพิธีบรมราชาภิเษก พระบาทสมเด็จพระวชิรเกล้าเจ้าอยู่หัว"
@@ -165,7 +155,7 @@ class Thailand(HolidayBase, InternationalHolidays):
             (DEC, 12, thai_special_in_lieu_holidays),
         ),
         # 1995-1997 (Bank of Thailand Data).
-        1996: ((JUN, 10, rama_ix_golden_jubilee),),
+        1996: (JUN, 10, rama_ix_golden_jubilee),
         # 1998-2000 (include In Lieus, Checked with Bank of Thailand Data).
         1998: (
             (MAY, 11, thai_special_in_lieu_holidays),
@@ -192,7 +182,7 @@ class Thailand(HolidayBase, InternationalHolidays):
             (JUN, 13, rama_ix_sixty_accession),
             (SEP, 20, thai_military_emergency_lockdown),
         ),
-        2007: ((DEC, 24, thai_election_in_lieu),),
+        2007: (DEC, 24, thai_election_in_lieu),
         2009: (
             (JAN, 2, thai_bridge_public_holiday),
             (APR, 10, thai_political_emergency_lockdown),
@@ -213,9 +203,9 @@ class Thailand(HolidayBase, InternationalHolidays):
             (OCT, 30, thai_flood_2011_emergency_lockdown),
             (OCT, 31, thai_flood_2011_emergency_lockdown),
         ),
-        2012: ((APR, 9, thai_bridge_public_holiday),),
-        2013: ((DEC, 30, thai_bridge_public_holiday),),
-        2014: ((AUG, 11, thai_bridge_public_holiday),),
+        2012: (APR, 9, thai_bridge_public_holiday),
+        2013: (DEC, 30, thai_bridge_public_holiday),
+        2014: (AUG, 11, thai_bridge_public_holiday),
         2015: (
             (JAN, 2, thai_bridge_public_holiday),
             (MAY, 4, thai_bridge_public_holiday),
@@ -225,8 +215,8 @@ class Thailand(HolidayBase, InternationalHolidays):
             (JUL, 18, thai_bridge_public_holiday),
             (OCT, 14, rama_ix_mourning),
         ),
-        2017: ((OCT, 26, rama_ix_cremation),),
-        2019: ((MAY, 6, rama_x_coronation_celebrations),),
+        2017: (OCT, 26, rama_ix_cremation),
+        2019: (MAY, 6, rama_x_coronation_celebrations),
         2020: (
             (JUL, 27, songkran_festival_in_lieu_covid),
             (SEP, 4, songkran_festival_in_lieu_covid),
@@ -246,13 +236,13 @@ class Thailand(HolidayBase, InternationalHolidays):
             (OCT, 14, thai_bridge_public_holiday),
             (DEC, 30, thai_bridge_public_holiday),
         ),
-        2023: ((MAY, 5, thai_bridge_public_holiday),),
+        2023: (MAY, 5, thai_bridge_public_holiday),
     }
     supported_languages = ("en_US", "th")
 
     def __init__(self, **kwargs) -> None:
         InternationalHolidays.__init__(self)
-        self.thls = _ThaiLunisolar()
+        ThaiCalendarHolidays.__init__(self)
         super().__init__(**kwargs)
 
     def _populate(self, year):
@@ -282,11 +272,7 @@ class Thailand(HolidayBase, InternationalHolidays):
             if (
                 self.observed
                 and self._is_weekend(dt)
-                and (
-                    1961 <= year <= 1973
-                    or 1995 <= year <= 1997
-                    or year >= 2001
-                )
+                and (1961 <= year <= 1973 or 1995 <= year <= 1997 or year >= 2001)
             ):
                 in_lieu = dt + td(days=+2 if self._is_saturday(dt) else +1)
                 for name in self.get_list(dt):
@@ -347,9 +333,7 @@ class Thailand(HolidayBase, InternationalHolidays):
         if year >= 1948:
             songkran_festival = tr("วันสงกรานต์")
             if year <= 1953 or (1957 <= year != 2020):
-                dt = self._add_holiday(
-                    songkran_festival, APR, 12 if 1989 <= year <= 1997 else 13
-                )
+                dt = self._add_holiday(songkran_festival, APR, 12 if 1989 <= year <= 1997 else 13)
                 if 1957 <= year <= 1988:
                     _add_observed(dt)
                 else:
@@ -368,17 +352,11 @@ class Thailand(HolidayBase, InternationalHolidays):
 
             songkran_festival_in_lieu = self.tr("ชดเชย%s") % songkran_festival
 
-            if self.observed and (
-                1995 <= year <= 1997 or 2001 <= year != 2020
-            ):
+            if self.observed and (1995 <= year <= 1997 or 2001 <= year != 2020):
                 if self._is_thursday(dt):
-                    self._add_holiday(
-                        songkran_festival_in_lieu, dt + td(days=+4)
-                    )
+                    self._add_holiday(songkran_festival_in_lieu, dt + td(days=+4))
                 elif self._is_friday(dt) or self._is_saturday(dt):
-                    self._add_holiday(
-                        songkran_festival_in_lieu, dt + td(days=+3)
-                    )
+                    self._add_holiday(songkran_festival_in_lieu, dt + td(days=+3))
 
         # National Labour day.
         # วันแรงงานแห่งชาติ
@@ -398,11 +376,7 @@ class Thailand(HolidayBase, InternationalHolidays):
         # Replaced by Rama IX's birthday in 1960 (B.E. 2503) by Sarit Thanarat.
         # TODO: Add check for 1939 if we support earlier dates.
 
-        _add_observed(
-            self._add_holiday(
-                tr("วันชาติ"), *((JUN, 24) if year <= 1959 else (DEC, 5))
-            )
-        )
+        _add_observed(self._add_holiday(tr("วันชาติ"), *((JUN, 24) if year <= 1959 else (DEC, 5))))
 
         # Coronation Day.
         # วันฉัตรมงคล
@@ -464,10 +438,7 @@ class Thailand(HolidayBase, InternationalHolidays):
             name = (
                 tr("วันเฉลิมพระชนมพรรษาสมเด็จพระบรมราชชนนีพันปีหลวง")
                 if year >= 2017
-                else tr(
-                    "วันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสิริกิติ์ "
-                    "พระบรมราชินีนาถ"
-                )
+                else tr("วันเฉลิมพระชนมพรรษาสมเด็จพระนางเจ้าสิริกิติ์ พระบรมราชินีนาถ")
             )
             _add_observed(self._add_holiday(name, AUG, 12))
 
@@ -499,10 +470,7 @@ class Thailand(HolidayBase, InternationalHolidays):
                     "มหาภูมิพลอดุลยเดชมหาราช บรมนาถบพิตร"
                 )
                 if year >= 2019
-                else tr(
-                    "วันคล้ายวันสวรรคตพระบาทสมเด็จพระปรมินทรมหาภูมิพล"
-                    "อดุลยเดช บรมนาถบพิตร"
-                )
+                else tr("วันคล้ายวันสวรรคตพระบาทสมเด็จพระปรมินทรมหาภูมิพลอดุลยเดช บรมนาถบพิตร")
             )
             _add_observed(self._add_holiday(name, OCT, 13))
 
@@ -536,8 +504,7 @@ class Thailand(HolidayBase, InternationalHolidays):
                     )
                     if year >= 2016
                     else tr(
-                        "วันเฉลิมพระชนมพรรษา"
-                        "พระบาทสมเด็จพระปรมินทรมหาภูมิพลอดุลยเดช บรมนาถบพิตร"
+                        "วันเฉลิมพระชนมพรรษาพระบาทสมเด็จพระปรมินทรมหาภูมิพลอดุลยเดช บรมนาถบพิตร"
                     )
                 )
             )
@@ -573,50 +540,38 @@ class Thailand(HolidayBase, InternationalHolidays):
         self._add_new_years_eve(tr("วันสิ้นปี"))
 
         # Thai Lunar Calendar Holidays
+        # See `_ThaiLunisolar` in holidays/utils.py for more details.
+        # Thai Lunar Calendar Holidays only work from 1941 to 2057.
 
-        """
-        See `_ThaiLunisolar` in holidays/utils.py for more details.
-
-        Thai Lunar Calendar Holidays only work from 1941 (B.E. 2484) onwards
-        until 2057 (B.E. 2600).
-        """
         # Makha Bucha.
         # วันมาฆบูชา
         # Status: In-Use.
 
-        makha_bucha_date = self.thls.makha_bucha_date(year)
+        makha_bucha_date = self._add_makha_bucha(tr("วันมาฆบูชา"))
         if makha_bucha_date:
-            _add_observed(
-                self._add_holiday(tr("วันมาฆบูชา"), makha_bucha_date)
-            )
+            _add_observed(makha_bucha_date)
 
         # Visakha Bucha.
         # วันวิสาขบูชา
         # Status: In-Use.
 
-        visakha_bucha_date = self.thls.visakha_bucha_date(year)
+        visakha_bucha_date = self._add_visakha_bucha(tr("วันวิสาขบูชา"))
         if visakha_bucha_date:
-            _add_observed(
-                self._add_holiday(tr("วันวิสาขบูชา"), visakha_bucha_date)
-            )
+            _add_observed(visakha_bucha_date)
 
         # Asarnha Bucha.
         # วันอาสาฬหบูชา
         # Status: In-Use.
         # This has its own in-lieu trigger.
 
-        asarnha_bucha_date = self.thls.asarnha_bucha_date(year)
-        if asarnha_bucha_date:
-            self._add_holiday(tr("วันอาสาฬหบูชา"), asarnha_bucha_date)
+        asarnha_bucha_date = self._add_asarnha_bucha(tr("วันอาสาฬหบูชา"))
 
         # Buddhist Lent Day.
         # วันเข้าพรรษา
         # Status: In-Use.
         # This has its own in-lieu trigger.
 
-        khao_phansa_date = self.thls.khao_phansa_date(year)
-        if khao_phansa_date:
-            self._add_holiday(tr("วันเข้าพรรษา"), khao_phansa_date)
+        self._add_khao_phansa(tr("วันเข้าพรรษา"))
 
         # Asarnha Bucha/Buddhist Lent Day (in lieu).
         # วันหยุดชดเชยวันอาสาฬหบูชา
@@ -688,9 +643,7 @@ class Thailand(HolidayBase, InternationalHolidays):
         }
         # For years with exact date data.
         if year in raeknakhwan_dates:
-            _add_observed(
-                self._add_holiday(raeknakhwan, *raeknakhwan_dates[year])
-            )
+            _add_observed(self._add_holiday(raeknakhwan, *raeknakhwan_dates[year]))
         # Approx. otherwise for 1957-2013.
         elif 1957 <= year <= 1996:
             _add_observed(self._add_holiday(raeknakhwan, MAY, 13))

holidays/countries/turkey.py

@@ -39,9 +39,7 @@ class Turkey(HolidayBase, IslamicHolidays, InternationalHolidays):
         self._add_labor_day("Labour Day")
 
         # 19th of May.
-        self._add_holiday(
-            "Commemoration of Ataturk, Youth and Sports Day", MAY, 19
-        )
+        self._add_holiday("Commemoration of Ataturk, Youth and Sports Day", MAY, 19)
 
         # 15th of Jul.
         # Became a national holiday after 15 Jul 2016 coup d'etat attempt.

holidays/countries/ukraine.py

@@ -59,17 +59,13 @@ class Ukraine(HolidayBase, ChristianHolidays, InternationalHolidays):
         )
 
         # International Women's Day.
-        observed_dates.add(
-            self._add_womens_day(tr("Міжнародний жіночий день"))
-        )
+        observed_dates.add(self._add_womens_day(tr("Міжнародний жіночий день")))
 
         # There is no holidays from March 15, 2022
         # https://zakon.rada.gov.ua/laws/show/2136-20#n26
         if year <= 2021:
             # Easter Sunday (Pascha).
-            observed_dates.add(
-                self._add_easter_sunday(tr("Великдень (Пасха)"))
-            )
+            observed_dates.add(self._add_easter_sunday(tr("Великдень (Пасха)")))
 
             # Holy Trinity Day.
             observed_dates.add(self._add_whit_sunday(tr("Трійця")))
@@ -84,16 +80,11 @@ class Ukraine(HolidayBase, ChristianHolidays, InternationalHolidays):
             may_1 = self._add_labor_day(name)
             observed_dates.add(may_1)
             if year <= 2017:
-                observed_dates.add(
-                    self._add_holiday(name, may_1 + td(days=+1))
-                )
+                observed_dates.add(self._add_holiday(name, may_1 + td(days=+1)))
 
             name = (
                 # Day of Victory over Nazism in World War II (Victory Day).
-                tr(
-                    "День перемоги над нацизмом у Другій світовій війні "
-                    "(День перемоги)"
-                )
+                tr("День перемоги над нацизмом у Другій світовій війні (День перемоги)")
                 if year >= 2016
                 # Victory Day.
                 else tr("День перемоги")
@@ -147,12 +138,9 @@ class Ukraine(HolidayBase, ChristianHolidays, InternationalHolidays):
         if self.observed:
             for dt in sorted(observed_dates):
                 if self._is_weekend(dt) and (
-                    date(1995, JAN, 27) <= dt <= date(1998, JAN, 9)
-                    or dt >= date(1999, APR, 23)
+                    date(1995, JAN, 27) <= dt <= date(1998, JAN, 9) or dt >= date(1999, APR, 23)
                 ):
-                    obs_date = dt + td(
-                        days=+2 if self._is_saturday(dt) else +1
-                    )
+                    obs_date = dt + td(days=+2 if self._is_saturday(dt) else +1)
                     while obs_date in self:
                         obs_date += td(days=+1)
                     hol_name = self.tr("%s (вихідний)") % self[dt]

holidays/countries/united_arab_emirates.py

@@ -43,9 +43,7 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
 
     def __init__(self, *args, **kwargs):
         InternationalHolidays.__init__(self)
-        IslamicHolidays.__init__(
-            self, calendar=UnitedArabEmiratesIslamicCalendar()
-        )
+        IslamicHolidays.__init__(self, calendar=UnitedArabEmiratesIslamicCalendar())
         super().__init__(*args, **kwargs)
 
     def _populate(self, year):
@@ -56,9 +54,7 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
 
         # Commemoration Day.
         if year >= 2015:
-            self._add_holiday(
-                "Commemoration Day", *((DEC, 1) if year >= 2019 else (NOV, 30))
-            )
+            self._add_holiday("Commemoration Day", *((DEC, 1) if year >= 2019 else (NOV, 30)))
 
         # National Day.
         self._add_holiday("National Day", DEC, 2)
@@ -83,15 +79,11 @@ class UnitedArabEmirates(HolidayBase, InternationalHolidays, IslamicHolidays):
 
         # Leilat al-Miraj.
         if year <= 2018:  # The UAE government removed this starting 2019.
-            self._add_isra_and_miraj_day(
-                "Leilat al-Miraj - The Prophet's ascension"
-            )
+            self._add_isra_and_miraj_day("Leilat al-Miraj - The Prophet's ascension")
 
         # Prophet Muhammad's Birthday.
         if year <= 2019:  # The UAE government removed this starting 2020.
-            self._add_mawlid_day(
-                "Mawlud al-Nabi - Prophet Mohammad's Birthday"
-            )
+            self._add_mawlid_day("Mawlud al-Nabi - Prophet Mohammad's Birthday")
 
 
 class AE(UnitedArabEmirates):
@@ -104,33 +96,33 @@ class ARE(UnitedArabEmirates):
 
 class UnitedArabEmiratesIslamicCalendar(_CustomIslamicCalendar):
     EID_AL_ADHA_DATES = {
-        2017: ((SEP, 1),),
-        2018: ((AUG, 21),),
-        2019: ((AUG, 11),),
-        2020: ((JUL, 31),),
+        2017: (SEP, 1),
+        2018: (AUG, 21),
+        2019: (AUG, 11),
+        2020: (JUL, 31),
     }
 
     EID_AL_FITR_DATES = {
-        2017: ((JUN, 25),),
-        2018: ((JUN, 14),),
-        2019: ((JUN, 3),),
-        2020: ((MAY, 24),),
+        2017: (JUN, 25),
+        2018: (JUN, 14),
+        2019: (JUN, 3),
+        2020: (MAY, 24),
     }
 
     HIJRI_NEW_YEAR_DATES = {
-        2017: ((SEP, 22),),
-        2018: ((SEP, 11),),
-        2019: ((AUG, 31),),
-        2020: ((AUG, 23),),
+        2017: (SEP, 22),
+        2018: (SEP, 11),
+        2019: (AUG, 31),
+        2020: (AUG, 23),
     }
 
     ISRA_AND_MIRAJ_DATES = {
-        2017: ((APR, 23),),
-        2018: ((APR, 13),),
+        2017: (APR, 23),
+        2018: (APR, 13),
     }
 
     MAWLID_DATES = {
-        2017: ((NOV, 30),),
-        2018: ((NOV, 19),),
-        2019: ((NOV, 9),),
+        2017: (NOV, 30),
+        2018: (NOV, 19),
+        2019: (NOV, 9),
     }

holidays/countries/united_kingdom.py

@@ -13,7 +13,7 @@ from datetime import date
 from datetime import timedelta as td
 from typing import Tuple, Union
 
-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 MAR, APR, MAY, JUN, JUL, AUG, SEP, NOV, DEC, MON
 from holidays.holiday_base import HolidayBase
 from holidays.holiday_groups import ChristianHolidays, InternationalHolidays
@@ -26,19 +26,25 @@ class UnitedKingdom(HolidayBase, ChristianHolidays, InternationalHolidays):
 
     country = "GB"
     special_holidays = {
-        1977: ((JUN, 7, "Silver Jubilee of Elizabeth II"),),
-        1981: ((JUL, 29, "Wedding of Charles and Diana"),),
-        1999: ((DEC, 31, "Millennium Celebrations"),),
-        2002: ((JUN, 3, "Golden Jubilee of Elizabeth II"),),
-        2011: ((APR, 29, "Wedding of William and Catherine"),),
-        2012: ((JUN, 5, "Diamond Jubilee of Elizabeth II"),),
+        1977: (JUN, 7, "Silver Jubilee of Elizabeth II"),
+        1981: (JUL, 29, "Wedding of Charles and Diana"),
+        1999: (DEC, 31, "Millennium Celebrations"),
+        2002: (JUN, 3, "Golden Jubilee of Elizabeth II"),
+        2011: (APR, 29, "Wedding of William and Catherine"),
+        2012: (JUN, 5, "Diamond Jubilee of Elizabeth II"),
         2022: (
             (JUN, 3, "Platinum Jubilee of Elizabeth II"),
             (SEP, 19, "State Funeral of Queen Elizabeth II"),
         ),
-        2023: ((MAY, 8, "Coronation of Charles III"),),
+        2023: (MAY, 8, "Coronation of Charles III"),
     }
     subdivisions: Union[Tuple[()], Tuple[str, ...]] = (
+        "ENG",  # England
+        "NIR",  # Northern Ireland
+        "SCT",  # Scotland
+        "WLS",  # Wales
+    )
+    _deprecated_subdivisions: Tuple[str, ...] = (
         "England",
         "Northern Ireland",
         "Scotland",
@@ -49,17 +55,14 @@ class UnitedKingdom(HolidayBase, ChristianHolidays, InternationalHolidays):
     def __init__(self, *args, **kwargs):
         ChristianHolidays.__init__(self)
         InternationalHolidays.__init__(self)
-        # default subdiv to UK; state for backwards compatibility
-        if not kwargs.get("subdiv", kwargs.get("state")):
-            kwargs["subdiv"] = "UK"
         super().__init__(*args, **kwargs)
 
-    def _add_observed(self, dt: date) -> None:
+    def _add_observed(self, dt: date, days: int = +1) -> None:
         if self.observed and self._is_weekend(dt):
-            obs_date = _get_nth_weekday_from(1, MON, dt)
-            if obs_date in self:
-                obs_date += td(days=+1)
-            self._add_holiday("%s (Observed)" % self[dt], obs_date)
+            self._add_holiday(
+                "%s (Observed)" % self[dt],
+                dt + td(days=+2 if self._is_saturday(dt) else days),
+            )
 
     def _populate(self, year: int) -> None:
         super()._populate(year)
@@ -84,28 +87,33 @@ class UnitedKingdom(HolidayBase, ChristianHolidays, InternationalHolidays):
                 2012: date(year, JUN, 4),
                 2022: date(year, JUN, 2),
             }
-            dt = spring_bank_dates.get(
-                year, _get_nth_weekday_of_month(-1, MON, MAY, year)
-            )
+            dt = spring_bank_dates.get(year, _get_nth_weekday_of_month(-1, MON, MAY, year))
             self._add_holiday("Spring Bank Holiday", dt)
 
         # Christmas Day
-        dec_25 = self._add_christmas_day("Christmas Day")
+        self._add_observed(self._add_christmas_day("Christmas Day"), days=+2)
 
         # Boxing Day
-        dec_26 = self._add_christmas_day_two("Boxing Day")
+        self._add_observed(self._add_christmas_day_two("Boxing Day"), days=+2)
 
-        self._add_observed(dec_25)
-        self._add_observed(dec_26)
+        if self.subdiv == "England":
+            self._add_subdiv_eng_holidays()
+        elif self.subdiv == "Northern Ireland":
+            self._add_subdiv_nir_holidays()
+        elif self.subdiv == "Scotland":
+            self._add_subdiv_sct_holidays()
+        elif self.subdiv == "Wales":
+            self._add_subdiv_wls_holidays()
 
     def _add_subdiv_holidays(self):
-        # New Year's Day
-        if self._year >= 1974:
-            self._add_observed(self._add_new_years_day("New Year's Day"))
+        if self.subdiv not in {"SCT", "Scotland"}:
+            # New Year's Day
+            if self._year >= 1974:
+                self._add_observed(self._add_new_years_day("New Year's Day"))
 
         super()._add_subdiv_holidays()
 
-    def _add_subdiv_england_holidays(self):
+    def _add_subdiv_eng_holidays(self):
         # Easter Monday
         self._add_easter_monday("Easter Monday")
 
@@ -116,7 +124,7 @@ class UnitedKingdom(HolidayBase, ChristianHolidays, InternationalHolidays):
                 _get_nth_weekday_of_month(-1, MON, AUG, self._year),
             )
 
-    def _add_subdiv_northern_ireland_holidays(self):
+    def _add_subdiv_nir_holidays(self):
         # St. Patrick's Day
         self._add_observed(self._add_holiday("St. Patrick's Day", MAR, 17))
 
@@ -133,7 +141,16 @@ class UnitedKingdom(HolidayBase, ChristianHolidays, InternationalHolidays):
                 _get_nth_weekday_of_month(-1, MON, AUG, self._year),
             )
 
-    def _add_subdiv_scotland_holidays(self):
+    def _add_subdiv_sct_holidays(self):
+        # New Year's Day
+        name = "New Year's Day"
+        jan_1 = self._add_new_years_day(name)
+        if self.observed and self._is_weekend(jan_1):
+            self._add_holiday(
+                "%s (Observed)" % name,
+                jan_1 + td(days=+3 if self._is_saturday(jan_1) else +1),
+            )
+
         # New Year Holiday
         name = "New Year Holiday"
         jan_2 = self._add_new_years_day_two(name)
@@ -150,44 +167,7 @@ class UnitedKingdom(HolidayBase, ChristianHolidays, InternationalHolidays):
         # St. Andrew's Day
         self._add_holiday("St. Andrew's Day", NOV, 30)
 
-    def _add_subdiv_uk_holidays(self):
-        # New Year Holiday
-        name = "New Year Holiday [Scotland]"
-        jan_2 = self._add_new_years_day_two(name)
-        self._add_observed(jan_2)
-        if self.observed and self._is_monday(jan_2):
-            self._add_new_years_day_three("%s (Observed)" % name)
-
-        # St. Patrick's Day
-        self._add_observed(
-            self._add_holiday("St. Patrick's Day [Northern Ireland]", MAR, 17)
-        )
-
-        # Easter Monday
-        self._add_easter_monday(
-            "Easter Monday [England/Wales/Northern Ireland]"
-        )
-
-        # Battle of the Boyne
-        self._add_holiday("Battle of the Boyne [Northern Ireland]", JUL, 12)
-
-        # Summer bank holiday (first Monday in August)
-        self._add_holiday(
-            "Summer Bank Holiday [Scotland]",
-            _get_nth_weekday_of_month(1, MON, AUG, self._year),
-        )
-
-        # Late Summer bank holiday (last Monday in August)
-        if self._year >= 1971:
-            self._add_holiday(
-                "Late Summer Bank Holiday [England/Wales/Northern Ireland]",
-                _get_nth_weekday_of_month(-1, MON, AUG, self._year),
-            )
-
-        # St. Andrew's Day
-        self._add_holiday("St. Andrew's Day [Scotland]", NOV, 30)
-
-    def _add_subdiv_wales_holidays(self):
+    def _add_subdiv_wls_holidays(self):
         # Easter Monday
         self._add_easter_monday("Easter Monday")