From 6750bf1761271edcf4fd6810e4ab0abf80477ff8 Mon Sep 17 00:00:00 2001 From: Arkadii Yakovets <2201626+arkid15r@users.noreply.github.com> Date: Thu, 17 Oct 2024 08:11:31 -0700 Subject: [PATCH] Satisfy mypy requirements (#2053) --- .pre-commit-config.yaml | 2 +- holidays/groups/buddhist.py | 16 ++++++++++------ holidays/groups/chinese.py | 18 +++++++++++------- holidays/groups/hindu.py | 16 ++++++++++------ 4 files changed, 32 insertions(+), 20 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..271aa3994 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. @@ -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 e2f78af62..95ec1a90f 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,14 +59,18 @@ 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: 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 933b397e5..c5f8c2f00 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. @@ -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]: