gh-109798: Normalize _datetime and datetime error messages
#127345
Change but got to not
- Loading branch information
commit 9915dfeaa47b5315d5312f919cfdcc3d3040e48b
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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, f"month must be in 1..12, not {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, f"month must be in 1..12, not {month}" | ||
| dim = _days_in_month(year, month) | ||
| assert 1 <= day <= dim, f"day must be in 1..{dim}, not {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 must be in {MINYEAR}..{MAXYEAR}, not {year}") | ||
|
|
||
| if not 0 < week < 53: | ||
| out_of_range = True | ||
|
|
@@ -570,12 +570,12 @@ def _check_date_fields(year, month, day): | |
| month = _index(month) | ||
| day = _index(day) | ||
| if not MINYEAR <= year <= MAXYEAR: | ||
| raise ValueError(f"year must be in {MINYEAR}..{MAXYEAR}, not {year}") | ||
| if not 1 <= month <= 12: | ||
| raise ValueError(f"month must be in 1..12, not {month}") | ||
| dim = _days_in_month(year, month) | ||
| if not 1 <= day <= dim: | ||
| raise ValueError(f"day must be in 1..{dim}, not {day}") | ||
| return year, month, day | ||
|
|
||
| def _check_time_fields(hour, minute, second, microsecond, fold): | ||
|
|
@@ -584,22 +584,22 @@ def _check_time_fields(hour, minute, second, microsecond, fold): | |
| second = _index(second) | ||
| microsecond = _index(microsecond) | ||
| if not 0 <= hour <= 23: | ||
| raise ValueError(f"hour must be in 0..23, not {hour}") | ||
| if not 0 <= minute <= 59: | ||
| raise ValueError(f"minute must be in 0..59, not {minute}") | ||
| if not 0 <= second <= 59: | ||
| raise ValueError(f"second must be in 0..59, not {second}") | ||
| if not 0 <= microsecond <= 999999: | ||
| raise ValueError(f"microsecond must be in 0..999999, not {microsecond}") | ||
| if fold not in (0, 1): | ||
| raise ValueError(f"fold must be either 0 or 1, not {fold}") | ||
| return hour, minute, second, microsecond, fold | ||
|
|
||
| def _check_tzinfo_arg(tz): | ||
| if tz is not None and not isinstance(tz, tzinfo): | ||
| raise TypeError( | ||
| "tzinfo argument must be None or of a tzinfo subclass, " | ||
| f"not {type(tz).__name__!r}" | ||
| ) | ||
|
|
||
| def _divide_and_round(a, b): | ||
|
|
@@ -2422,7 +2422,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 " | ||
| f"timedelta(hours=24), not {offset!r}") | ||
|
Member
There was a problem hiding this comment. Probably not going to be a great user experience here because of how bad the >>> print(f"{timedelta(hours=-25)!r}")
datetime.timedelta(days=-2, seconds=82800)Maybe it will be clearer if we do it this way: if offset < timedelta(0):
offset_str = f"-{-offset)}"
else:
offset_str = str(offset)That will print stuff like Probably a more elaborate timedelta formatter would be better, since we basically always want this in
Contributor
Author
|
||
| return cls._create(offset, name) | ||
|
|
||
| def __init_subclass__(cls): | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.