From ca5709e9aa668e54e49d445ae488ab0ec83efa97 Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets Date: Tue, 15 Oct 2024 18:14:55 -0700 Subject: [PATCH 1/2] Satisfy mypy requirements --- .pre-commit-config.yaml | 2 +- holidays/groups/buddhist.py | 2 +- holidays/groups/chinese.py | 4 ++-- holidays/groups/hindu.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e60438f96..69d4f5068 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -54,7 +54,7 @@ repos: exclude: ^(docs) - repo: https://github.com/pre-commit/mirrors-mypy - rev: v1.11.2 + rev: v1.12.0 hooks: - id: mypy additional_dependencies: diff --git a/holidays/groups/buddhist.py b/holidays/groups/buddhist.py index c537d0de5..470c29c40 100644 --- a/holidays/groups/buddhist.py +++ b/holidays/groups/buddhist.py @@ -26,7 +26,7 @@ def __init__(self, cls=None, show_estimated=False) -> None: self._buddhist_calendar_show_estimated = show_estimated def _add_buddhist_calendar_holiday( - self, name: str, dt_estimated: tuple[date, bool] + self, name: str, dt_estimated: tuple[Optional[date], bool] ) -> Optional[date]: """ Add Buddhist calendar holiday. diff --git a/holidays/groups/chinese.py b/holidays/groups/chinese.py index e2f78af62..f513bff1b 100644 --- a/holidays/groups/chinese.py +++ b/holidays/groups/chinese.py @@ -48,7 +48,7 @@ def _mid_autumn_festival(self): return self._chinese_calendar.mid_autumn_date(self._year)[0] def _add_chinese_calendar_holiday( - self, name: str, dt_estimated: tuple[date, bool], days_delta: int = 0 + self, name: str, dt_estimated: tuple[Optional[date], bool], days_delta: int = 0 ) -> Optional[date]: """ Add Chinese calendar holiday. @@ -59,7 +59,7 @@ def _add_chinese_calendar_holiday( estimated_label = getattr(self, "estimated_label", "%s (estimated)") dt, is_estimated = dt_estimated - if days_delta != 0: + if days_delta and dt is not None: dt = _timedelta(dt, days_delta) return self._add_holiday( diff --git a/holidays/groups/hindu.py b/holidays/groups/hindu.py index 933b397e5..f3e8dac7e 100644 --- a/holidays/groups/hindu.py +++ b/holidays/groups/hindu.py @@ -26,7 +26,7 @@ def __init__(self, cls=None, show_estimated=False) -> None: self._hindu_calendar_show_estimated = show_estimated def _add_hindu_calendar_holiday( - self, name: str, dt_estimated: tuple[date, bool] + self, name: str, dt_estimated: tuple[Optional[date], bool] ) -> Optional[date]: """ Add Hindu calendar holiday. From f64af5efc16a85c64d9340ba953c2bde2fb74324 Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets Date: Tue, 15 Oct 2024 18:36:35 -0700 Subject: [PATCH 2/2] Update code --- holidays/groups/buddhist.py | 14 +++++++++----- holidays/groups/chinese.py | 16 ++++++++++------ holidays/groups/hindu.py | 14 +++++++++----- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/holidays/groups/buddhist.py b/holidays/groups/buddhist.py index 470c29c40..271aa3994 100644 --- a/holidays/groups/buddhist.py +++ b/holidays/groups/buddhist.py @@ -37,11 +37,15 @@ def _add_buddhist_calendar_holiday( estimated_label = getattr(self, "estimated_label", "%s (estimated)") dt, is_estimated = dt_estimated - return self._add_holiday( - self.tr(estimated_label) % self.tr(name) - if is_estimated and self._buddhist_calendar_show_estimated - else name, - dt, + return ( + self._add_holiday( + self.tr(estimated_label) % self.tr(name) + if is_estimated and self._buddhist_calendar_show_estimated + else name, + dt, + ) + if dt + else None ) def _add_vesak(self, name) -> Optional[date]: diff --git a/holidays/groups/chinese.py b/holidays/groups/chinese.py index f513bff1b..95ec1a90f 100644 --- a/holidays/groups/chinese.py +++ b/holidays/groups/chinese.py @@ -59,14 +59,18 @@ def _add_chinese_calendar_holiday( estimated_label = getattr(self, "estimated_label", "%s (estimated)") dt, is_estimated = dt_estimated - if days_delta and dt is not None: + if days_delta and dt: dt = _timedelta(dt, days_delta) - return self._add_holiday( - self.tr(estimated_label) % self.tr(name) - if is_estimated and self._chinese_calendar_show_estimated - else name, - dt, + return ( + self._add_holiday( + self.tr(estimated_label) % self.tr(name) + if is_estimated and self._chinese_calendar_show_estimated + else name, + dt, + ) + if dt + else None ) def _add_chinese_birthday_of_buddha(self, name) -> Optional[date]: diff --git a/holidays/groups/hindu.py b/holidays/groups/hindu.py index f3e8dac7e..c5f8c2f00 100644 --- a/holidays/groups/hindu.py +++ b/holidays/groups/hindu.py @@ -37,11 +37,15 @@ def _add_hindu_calendar_holiday( estimated_label = getattr(self, "estimated_label", "%s (estimated)") dt, is_estimated = dt_estimated - return self._add_holiday( - self.tr(estimated_label) % self.tr(name) - if is_estimated and self._hindu_calendar_show_estimated - else name, - dt, + return ( + self._add_holiday( + self.tr(estimated_label) % self.tr(name) + if is_estimated and self._hindu_calendar_show_estimated + else name, + dt, + ) + if dt + else None ) def _add_diwali(self, name) -> Optional[date]: