]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-110850: Replace private _PyTime_MAX with public PyTime_MAX (#115751)
authorVictor Stinner <vstinner@python.org>
Wed, 21 Feb 2024 08:11:40 +0000 (09:11 +0100)
committerGitHub <noreply@github.com>
Wed, 21 Feb 2024 08:11:40 +0000 (08:11 +0000)
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.

Include/internal/pycore_time.h
Modules/_threadmodule.c
Python/thread_pthread.h

index 682aee2170bdaef361bdb40e6b3c929403db7f77..57ee55f14414a75706216bc5b6a7c46c9e7857c0 100644 (file)
@@ -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);
index 25e100278790552d162834e35c40ec257b431a15..4c2185cc7ea1fd306b20dc714dfda00e4a510413 100644 (file)
@@ -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);
index 17f6ae7eb70553d5c73da54c57bac924a2e49912..dee21f028ac48cdce6e13d5839f38d56f8eb3706 100644 (file)
@@ -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.