#15421: fix an OverflowError in Calendar.itermonthdates() after datetime.MAXYEAR. Patch by Cédric Krier.
This commit is contained in:
parent
e418d76089
commit
85710a40e7
|
@ -161,7 +161,11 @@ class Calendar(object):
|
|||
oneday = datetime.timedelta(days=1)
|
||||
while True:
|
||||
yield date
|
||||
date += oneday
|
||||
try:
|
||||
date += oneday
|
||||
except OverflowError:
|
||||
# Adding one day could fail after datetime.MAXYEAR
|
||||
break
|
||||
if date.month != month and date.weekday() == self.firstweekday:
|
||||
break
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@ from test import support
|
|||
from test.script_helper import assert_python_ok
|
||||
import time
|
||||
import locale
|
||||
import datetime
|
||||
|
||||
result_2004_text = """
|
||||
2004
|
||||
|
@ -265,6 +266,11 @@ class CalendarTestCase(unittest.TestCase):
|
|||
new_october = calendar.TextCalendar().formatmonthname(2010, 10, 10)
|
||||
self.assertEqual(old_october, new_october)
|
||||
|
||||
def test_itermonthdates(self):
|
||||
# ensure itermonthdates doesn't overflow after datetime.MAXYEAR
|
||||
# see #15421
|
||||
list(calendar.Calendar().itermonthdates(datetime.MAXYEAR, 12))
|
||||
|
||||
|
||||
class MonthCalendarTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
|
|
Loading…
Reference in New Issue