Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Lib/test/test_time.py
Original file line number Diff line number Diff line change
Expand Up @@ -1013,6 +1013,18 @@ def test_FromSecondsObject(self):
with self.assertRaises(ValueError):
_PyTime_FromSecondsObject(float('nan'), time_rnd)

def test_FromSecondsObject_float_overflow_message(self):
# Float path must report a PyTime_t overflow, like the integer path.
from _testcapi import PyTime_MIN, PyTime_MAX
from _testinternalcapi import _PyTime_FromSecondsObject
for value in (float(PyTime_MAX), float(PyTime_MIN)):
for time_rnd, _ in ROUNDING_MODES:
Comment thread
sobolevn marked this conversation as resolved.
with self.subTest(value=value, time_rnd=time_rnd):
with self.assertRaisesRegex(
OverflowError,
"timestamp out of range for C PyTime_t"):
_PyTime_FromSecondsObject(value, time_rnd)

def test_AsSecondsDouble(self):
from _testcapi import PyTime_AsSecondsDouble

Expand Down

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be in Library.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to Library.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix the :exc:`OverflowError` message for out-of-range float timestamps: it
now names ``PyTime_t`` instead of ``time_t``. Patch by tonghuaroot.
4 changes: 2 additions & 2 deletions Python/pytime.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ static void
pytime_overflow(void)
{
PyErr_SetString(PyExc_OverflowError,
"timestamp too large to convert to C PyTime_t");
"timestamp out of range for C PyTime_t");
}


Expand Down Expand Up @@ -636,7 +636,7 @@ pytime_from_double(PyTime_t *tp, double value, _PyTime_round_t round,

/* See comments in pytime_double_to_denominator */
if (!((double)PyTime_MIN <= d && d < -(double)PyTime_MIN)) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The error message of pytime_overflow currently says "too large," but it can also be too small, let's update to:

timestamp out of range for C PyTime_t

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, updated to timestamp out of range for C PyTime_t. This also covers the too-small case.

pytime_time_t_overflow();
pytime_overflow();
*tp = 0;
return -1;
}
Expand Down
Loading