Update error messages to be the same in datetime

Author: donBarbos

Lib/_pydatetime.py

@@ -60,14 +60,14 @@ def _days_in_month(year, month):
 
 def _days_before_month(year, month):
     "year, month -> number of days in year preceding first day of month."
-    assert 1 <= month <= 12, 'month must be in 1..12'
+    assert 1 <= month <= 12, f"month must be in 1..12, but got {month}"
     return _DAYS_BEFORE_MONTH[month] + (month > 2 and _is_leap(year))
 
 def _ymd2ord(year, month, day):
     "year, month, day -> ordinal, considering 01-Jan-0001 as day 1."
-    assert 1 <= month <= 12, 'month must be in 1..12'
+    assert 1 <= month <= 12, f"month must be in 1..12, but got {month}"
     dim = _days_in_month(year, month)
-    assert 1 <= day <= dim, ('day must be in 1..%d' % dim)
+    assert 1 <= day <= dim, f"day must be in 1..{dim}, but got {day}"
     return (_days_before_year(year) +
             _days_before_month(year, month) +
             day)
@@ -512,7 +512,7 @@ def _parse_isoformat_time(tstr):
 def _isoweek_to_gregorian(year, week, day):
     # Year is bounded this way because 9999-12-31 is (9999, 52, 5)
     if not MINYEAR <= year <= MAXYEAR:
-        raise ValueError(f"Year is out of range: {year}")
+        raise ValueError(f"year must be in {MINYEAR}..{MAXYEAR}, but got {year}")
 
     if not 0 < week < 53:
         out_of_range = True
@@ -561,21 +561,21 @@ def _check_utc_offset(name, offset):
         raise TypeError("tzinfo.%s() must return None "
                         "or timedelta, not '%s'" % (name, type(offset)))
     if not -timedelta(1) < offset < timedelta(1):
-        raise ValueError("%s()=%s, must be strictly between "
-                         "-timedelta(hours=24) and timedelta(hours=24)" %
-                         (name, offset))
+        raise ValueError("offset must be a timedelta "
+                         "strictly between -timedelta(hours=24) and "
+                         f"timedelta(hours=24), not {offset.__repr__()}")
 
 def _check_date_fields(year, month, day):
     year = _index(year)
     month = _index(month)
     day = _index(day)
     if not MINYEAR <= year <= MAXYEAR:
-        raise ValueError('year must be in %d..%d' % (MINYEAR, MAXYEAR), year)
+        raise ValueError(f"year must be in {MINYEAR}..{MAXYEAR}, but got {year}")
     if not 1 <= month <= 12:
-        raise ValueError('month must be in 1..12', month)
+        raise ValueError(f"month must be in 1..12, but got {month}")
     dim = _days_in_month(year, month)
     if not 1 <= day <= dim:
-        raise ValueError('day must be in 1..%d' % dim, day)
+        raise ValueError(f"day must be in 1..{dim}, but got {day}")
     return year, month, day
 
 def _check_time_fields(hour, minute, second, microsecond, fold):
@@ -584,15 +584,15 @@ def _check_time_fields(hour, minute, second, microsecond, fold):
     second = _index(second)
     microsecond = _index(microsecond)
     if not 0 <= hour <= 23:
-        raise ValueError('hour must be in 0..23', hour)
+        raise ValueError(f"hour must be in 0..23, but got {hour}")
     if not 0 <= minute <= 59:
-        raise ValueError('minute must be in 0..59', minute)
+        raise ValueError(f"minute must be in 0..59, but got {minute}")
     if not 0 <= second <= 59:
-        raise ValueError('second must be in 0..59', second)
+        raise ValueError(f"second must be in 0..59, but got {second}")
     if not 0 <= microsecond <= 999999:
-        raise ValueError('microsecond must be in 0..999999', microsecond)
+        raise ValueError(f"microsecond must be in 0..999999, but got {microsecond}")
     if fold not in (0, 1):
-        raise ValueError('fold must be either 0 or 1', fold)
+        raise ValueError(f"fold must be either 0 or 1, but got {fold}")
     return hour, minute, second, microsecond, fold
 
 def _check_tzinfo_arg(tz):
@@ -2419,7 +2419,7 @@ def __new__(cls, offset, name=_Omitted):
         if not cls._minoffset <= offset <= cls._maxoffset:
             raise ValueError("offset must be a timedelta "
                              "strictly between -timedelta(hours=24) and "
-                             "timedelta(hours=24).")
+                             f"timedelta(hours=24), not {offset.__repr__()}")
         return cls._create(offset, name)
 
     def __init_subclass__(cls):

Modules/_datetimemodule.c

@@ -637,17 +637,22 @@ check_date_args(int year, int month, int day)
 {
 
     if (year < MINYEAR || year > MAXYEAR) {
-        PyErr_Format(PyExc_ValueError, "year %i is out of range", year);
+        PyErr_Format(PyExc_ValueError,
+                     "year must be in %d..%d, but got %d",
+                     MINYEAR, MAXYEAR, year);
         return -1;
     }
     if (month < 1 || month > 12) {
         PyErr_SetString(PyExc_ValueError,
-                        "month must be in 1..12");
+                        "month must be in 1..12, but got %d",
+                        month);
         return -1;
     }
-    if (day < 1 || day > days_in_month(year, month)) {
+    int dim = days_in_month(year, month)
+    if (day < 1 || day > dim) {
         PyErr_SetString(PyExc_ValueError,
-                        "day is out of range for month");
+                        "day must be in 1..%d, but got %d",
+                        dim, day);
         return -1;
     }
     return 0;
@@ -661,27 +666,27 @@ check_time_args(int h, int m, int s, int us, int fold)
 {
     if (h < 0 || h > 23) {
         PyErr_SetString(PyExc_ValueError,
-                        "hour must be in 0..23");
+                        "hour must be in 0..23, but got %i", h);
         return -1;
     }
     if (m < 0 || m > 59) {
         PyErr_SetString(PyExc_ValueError,
-                        "minute must be in 0..59");
+                        "minute must be in 0..59, but got %i", m);
         return -1;
     }
     if (s < 0 || s > 59) {
         PyErr_SetString(PyExc_ValueError,
-                        "second must be in 0..59");
+                        "second must be in 0..59, but got %i", s);
         return -1;
     }
     if (us < 0 || us > 999999) {
         PyErr_SetString(PyExc_ValueError,
-                        "microsecond must be in 0..999999");
+                        "microsecond must be in 0..999999, but got %i", us);
         return -1;
     }
     if (fold != 0 && fold != 1) {
         PyErr_SetString(PyExc_ValueError,
-                        "fold must be either 0 or 1");
+                        "fold must be either 0 or 1, but got %i", fold);
         return -1;
     }
     return 0;
@@ -1436,7 +1441,7 @@ new_timezone(PyObject *offset, PyObject *name)
         PyErr_Format(PyExc_ValueError, "offset must be a timedelta"
                      " strictly between -timedelta(hours=24) and"
                      " timedelta(hours=24),"
-                     " not %R.", offset);
+                     " not %R", offset);
         return NULL;
     }
 
@@ -1508,7 +1513,8 @@ call_tzinfo_method(PyObject *tzinfo, const char *name, PyObject *tzinfoarg)
             Py_DECREF(offset);
             PyErr_Format(PyExc_ValueError, "offset must be a timedelta"
                          " strictly between -timedelta(hours=24) and"
-                         " timedelta(hours=24).");
+                         " timedelta(hours=24),"
+                         " not %R", offset);
             return NULL;
         }
     }
@@ -3387,7 +3393,9 @@ date_fromisocalendar(PyObject *cls, PyObject *args, PyObject *kw)
     int rv = iso_to_ymd(year, week, day, &year, &month, &day);
 
     if (rv == -4) {
-        PyErr_Format(PyExc_ValueError, "Year is out of range: %d", year);
+        PyErr_Format(PyExc_ValueError,
+                     "year must be in %d..%d, but got %d",
+                     MINYEAR, MAXYEAR, year);
         return NULL;
     }
 
@@ -3397,7 +3405,7 @@ date_fromisocalendar(PyObject *cls, PyObject *args, PyObject *kw)
     }
 
     if (rv == -3) {
-        PyErr_Format(PyExc_ValueError, "Invalid day: %d (range is [1, 7])",
+        PyErr_Format(PyExc_ValueError, "Invalid weekday: %d (range is [1, 7])",
                      day);
         return NULL;
     }
@@ -5357,7 +5365,9 @@ utc_to_seconds(int year, int month, int day,
 
     /* ymd_to_ord() doesn't support year <= 0 */
     if (year < MINYEAR || year > MAXYEAR) {
-        PyErr_Format(PyExc_ValueError, "year %i is out of range", year);
+        PyErr_Format(PyExc_ValueError,
+                     "year must be in %d..%d, but got %d",
+                     MINYEAR, MAXYEAR, year);
         return -1;
     }