sharpetronics/fixedcal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

leap year fixes in date properties

Browse Source
This commit is contained in:
PyryL 2022-12-11 18:45:33 +02:00
parent 08c74c36e5
commit b7404f7741
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fixedcal/core/date.py
View File

@ -79,6 +79,8 @@ class FixedDate:
"""In range 1...29""" """In range 1...29"""
if self.is_leap_day: if self.is_leap_day:
return 29 return 29
if self.is_leap_year and self.day_of_year > 169: # leap day past this year
return ((self._day_of_year-2) % 28) + 1
return ((self._day_of_year-1) % 28) + 1 return ((self._day_of_year-1) % 28) + 1
@property @property

12
tests/leap_year_test.py
View File

@ -34,6 +34,18 @@ class TestLeapYear(unittest.TestCase):
self.assertEqual(fixed_date.week_of_year, 24) self.assertEqual(fixed_date.week_of_year, 24)
self.assertEqual(fixed_date.year_quarter, 2) self.assertEqual(fixed_date.year_quarter, 2)
def test_year_day_of_leap_year(self):
fixed_date = FixedDate(day_of_year=366, year=2024)
self.assertTrue(fixed_date.is_year_day)
self.assertEqual(fixed_date.year, 2024)
self.assertEqual(fixed_date.month, 14)
self.assertEqual(fixed_date.day_of_month, 1)
def test_ordinary_date_after_leap_day(self):
fixed_date = FixedDate(datetime(2024, 10, 13))
self.assertEqual(fixed_date.month, 11)
self.assertEqual(fixed_date.day_of_month, 6)
def test_fixed_date_difference_over_gregorian_leap_day(self): def test_fixed_date_difference_over_gregorian_leap_day(self):
# in Gregorian system there are 7 days between, # in Gregorian system there are 7 days between,