diff options
| author | Victor Stinner <vstinner@python.org> | 2024-02-21 08:11:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-21 08:11:40 (GMT) |
| commit | 77430b6a329bb04ca884d08afefda25112372afa (patch) | |
| tree | 509b76cbe2ed47bdeed1520c7de15c11217bc3a3 | |
| parent | 1235e84276ab8eabca1348034453c614f0b6b543 (diff) | |
| download | cpython-77430b6a329bb04ca884d08afefda25112372afa.zip cpython-77430b6a329bb04ca884d08afefda25112372afa.tar.gz cpython-77430b6a329bb04ca884d08afefda25112372afa.tar.bz2 | |
gh-110850: Replace private _PyTime_MAX with public PyTime_MAX (#115751)
Remove references to the old names _PyTime_MIN
and _PyTime_MAX, now that PyTime_MIN and
PyTime_MAX are public.
Replace also _PyTime_MIN with PyTime_MIN.
| -rw-r--r-- | Include/internal/pycore_time.h | 6 | ||||
| -rw-r--r-- | Modules/_threadmodule.c | 2 | ||||
| -rw-r--r-- | Python/thread_pthread.h | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/Include/internal/pycore_time.h b/Include/internal/pycore_time.h index 682aee2..57ee55f 100644 --- a/Include/internal/pycore_time.h +++ b/Include/internal/pycore_time.h @@ -318,10 +318,6 @@ extern int _PyTime_PerfCounterWithInfo( PyTime_t *t, _Py_clock_info_t *info); -// Alias for backward compatibility -#define _PyTime_MIN PyTime_MIN -#define _PyTime_MAX PyTime_MAX - // --- _PyDeadline ----------------------------------------------------------- @@ -352,7 +348,7 @@ extern int _PyTimeFraction_Set( PyTime_t denom); // Compute ticks * frac.numer / frac.denom. -// Clamp to [_PyTime_MIN; _PyTime_MAX] on overflow. +// Clamp to [PyTime_MIN; PyTime_MAX] on overflow. extern PyTime_t _PyTimeFraction_Mul( PyTime_t ticks, const _PyTimeFraction *frac); diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index 25e1002..4c2185c 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -1948,7 +1948,7 @@ thread_module_exec(PyObject *module) // TIMEOUT_MAX double timeout_max = (double)PY_TIMEOUT_MAX * 1e-6; - double time_max = PyTime_AsSecondsDouble(_PyTime_MAX); + double time_max = PyTime_AsSecondsDouble(PyTime_MAX); timeout_max = Py_MIN(timeout_max, time_max); // Round towards minus infinity timeout_max = floor(timeout_max); diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h index 17f6ae7..dee21f0 100644 --- a/Python/thread_pthread.h +++ b/Python/thread_pthread.h @@ -486,9 +486,9 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds, if (microseconds >= 0) { // bpo-41710: PyThread_acquire_lock_timed() cannot report timeout // overflow to the caller, so clamp the timeout to - // [_PyTime_MIN, _PyTime_MAX]. + // [PyTime_MIN, PyTime_MAX]. // - // _PyTime_MAX nanoseconds is around 292.3 years. + // PyTime_MAX nanoseconds is around 292.3 years. // // _thread.Lock.acquire() and _thread.RLock.acquire() raise an // OverflowError if microseconds is greater than PY_TIMEOUT_MAX. |