Use MINYEAR and MAXYEAR in bounds checks

python · vstinner · Apr 29, 2019 · Feb 15, 2019 · Feb 17, 2019 · Feb 17, 2019
commit c8444b70f18a6fb9a157c942a07d61f6c3aea8a0
diff --git a/Lib/datetime.py b/Lib/datetime.py
@@ -890,7 +890,7 @@ def fromisocalendar(cls, year, week, day):
 
         This is the inverse of the date.isocalendar() function"""
         # Year is bounded this way because 9999-12-31 is (9999, 52, 5)
-        if not 0 < year < 10000:
+        if not MINYEAR <= year <= MAXYEAR:
             raise ValueError(f"Year is out of range: {year}")
 
         if not 0 < week < 53:

diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c
@@ -3024,7 +3024,7 @@ date_fromisocalendar(PyObject *cls, PyObject *args, PyObject *kw)
     }
 
     // Year is bounded to 0 < year < 10000 because 9999-12-31 is (9999, 52, 5)
-    if (year <= 0 || year >= 10000) {
+    if (year < MINYEAR || year > MAXYEAR) {
         PyErr_Format(PyExc_ValueError, "Year is out of range: %d", year);
         return NULL;
     }