Skip to content

gh-81267: Correct time.sleep error message #131055

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 7 commits into from
Mar 12, 2025
Merged

gh-81267: Correct time.sleep error message #131055

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b6348a
Initial
StanFromIreland Mar 10, 2025
7b99519
Update Modules/timemodule.c
StanFromIreland Mar 11, 2025
8ba9ffd
Move implementation to pytime
StanFromIreland Mar 11, 2025
d7e9e00
Victors suggestions
StanFromIreland Mar 12, 2025
6848fc4
Update Python/pytime.c
vstinner Mar 12, 2025
1a79490
Update Lib/test/test_time.py
vstinner Mar 12, 2025
3b4d0a0
Update Lib/test/test_time.py
vstinner Mar 12, 2025
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
Prev Previous commit
Next Next commit
Move implementation to pytime
  • Loading branch information
@StanFromIreland
StanFromIreland committed Mar 11, 2025
commit 8ba9ffd0d4e3c01ebd9161c899aa317659753b74
5 changes: 0 additions & 5 deletions Modules/timemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,6 @@ time_sleep(PyObject *self, PyObject *timeout_obj)

PyTime_t timeout;
if (_PyTime_FromSecondsObject(&timeout, timeout_obj, _PyTime_ROUND_TIMEOUT)) {
Comment thread
StanFromIreland marked this conversation as resolved.
Outdated
Comment thread
StanFromIreland marked this conversation as resolved.
Outdated
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
PyErr_Format(PyExc_TypeError,
"'%T' object cannot be interpreted as an integer or float",
timeout_obj);
}
return NULL;
}
if (timeout < 0) {
Expand Down
34 changes: 19 additions & 15 deletions Python/pytime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,26 +594,30 @@ pytime_from_object(PyTime_t *tp, PyObject *obj, _PyTime_round_t round,
}
return pytime_from_double(tp, d, round, unit_to_ns);
}
else {
Comment thread
StanFromIreland marked this conversation as resolved.
long long sec = PyLong_AsLongLong(obj);
if (sec == -1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
pytime_overflow();
}
return -1;
}

static_assert(sizeof(long long) <= sizeof(PyTime_t),
"PyTime_t is smaller than long long");
PyTime_t ns = (PyTime_t)sec;
if (pytime_mul(&ns, unit_to_ns) < 0) {
long long sec = PyLong_AsLongLong(obj);
if (sec == -1 && PyErr_Occurred()) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
pytime_overflow();
return -1;
}
if (PyErr_ExceptionMatches(PyExc_TypeError)) {
Comment thread
StanFromIreland marked this conversation as resolved.
Outdated
PyErr_Format(PyExc_TypeError,
"'%T' object cannot be interpreted as an integer or float",
obj);
Comment thread
vstinner marked this conversation as resolved.
Outdated
}
return -1;
}

*tp = ns;
return 0;
static_assert(sizeof(long long) <= sizeof(PyTime_t),
"PyTime_t is smaller than long long");
PyTime_t ns = (PyTime_t)sec;
if (pytime_mul(&ns, unit_to_ns) < 0) {
pytime_overflow();
return -1;
}

*tp = ns;
return 0;
}


Expand Down