Merge pull request #488 from peopledoc/netherlands-day-constants

Small refactor in Netherlands calendar to use core constants
This commit is contained in:
Bruno Bord 2020-04-17 11:22:36 +02:00 committed by GitHub
commit 011aece3c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions

View File

@ -5,6 +5,7 @@
- Added Kenyan calendar, by @KidkArolis (#484)
- Fixed Lithuania calender to use the core flags for Assumption and All Saints (#468).
- Fixed Malta calendar ; January 1st was already included, no need to add it to the ``FIXED_HOLIDAYS`` property (#469).
- Small refactor in Netherlands calendar to use core constants (#470).
## v8.3.0 (2020-04-14)

View File

@ -1,5 +1,5 @@
from datetime import date
from ..core import WesternCalendar, ChristianMixin
from datetime import date, timedelta
from ..core import WesternCalendar, ChristianMixin, SUN
from ..registry_tools import iso_register
@ -26,15 +26,15 @@ class Netherlands(WesternCalendar, ChristianMixin):
30 April, unless this is a Sunday in which case it is the 29th.
"""
if year > 2013:
if date(year, 4, 27).weekday() != 6:
return date(year, 4, 27), "King's day"
else:
return date(year, 4, 26), "King's day"
king_day = date(year, 4, 27)
if king_day.weekday() != SUN:
return (king_day, "King's day")
return (king_day - timedelta(days=1), "King's day")
else:
if date(year, 4, 30).weekday() != 6:
return date(year, 4, 30), "Queen's day"
else:
return date(year, 4, 29), "Queen's day"
queen_day = date(year, 4, 30)
if queen_day.weekday() != SUN:
return (queen_day, "Queen's day")
return (queen_day - timedelta(days=1), "Queen's day")
def get_variable_days(self, year):
days = super().get_variable_days(year)