May 30, 2025 · May 26, 2025 · May 28, 2025 · May 28, 2025 · May 30, 2025 · May 30, 2025
diff --git a/Include/internal/pycore_lock.h b/Include/internal/pycore_lock.h

    // Handle signals if interrupted while waiting on the lock.
    _PY_LOCK_HANDLE_SIGNALS = 2,

    // Fail if interrupted by a signal while waiting on the lock.
    _PY_FAIL_IF_INTERRUPTED = 4,
 } _PyLockFlags;

 // Lock a mutex with an optional timeout and additional options. See
diff --git a/Python/lock.c b/Python/lock.c
                return PY_LOCK_INTR;
            }
        }
        else if (ret == Py_PARK_INTR && (flags & _PY_FAIL_IF_INTERRUPTED)) {
            return PY_LOCK_INTR;
        }
        else if (ret == Py_PARK_TIMEOUT) {
            assert(timeout >= 0);
            return PY_LOCK_FAILURE;
diff --git a/Python/thread.c b/Python/thread.c

    _PyLockFlags flags = _Py_LOCK_DONT_DETACH;
    if (intr_flag) {
        flags |=_PY_LOCK_HANDLE_SIGNALS;
        flags |=_PY_FAIL_IF_INTERRUPTED;
    }

    return _PyMutex_LockTimed((PyMutex *)lock, timeout, flags);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -48,6 +48,9 @@ typedef enum _PyLockFlags {

		// Handle signals if interrupted while waiting on the lock.
		_PY_LOCK_HANDLE_SIGNALS = 2,

		// Fail if interrupted by a signal while waiting on the lock.
		_PY_FAIL_IF_INTERRUPTED = 4,
		} _PyLockFlags;

		// Lock a mutex with an optional timeout and additional options. See
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,6 +119,9 @@ _PyMutex_LockTimed(PyMutex *m, PyTime_t timeout, _PyLockFlags flags)
		return PY_LOCK_INTR;
		}
		}
		else if (ret == Py_PARK_INTR && (flags & _PY_FAIL_IF_INTERRUPTED)) {
		return PY_LOCK_INTR;
		}
		else if (ret == Py_PARK_TIMEOUT) {
		assert(timeout >= 0);
		return PY_LOCK_FAILURE;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,7 +119,7 @@ PyThread_acquire_lock_timed(PyThread_type_lock lock, PY_TIMEOUT_T microseconds,

		_PyLockFlags flags = _Py_LOCK_DONT_DETACH;
		if (intr_flag) {
		flags \|=_PY_LOCK_HANDLE_SIGNALS;
		flags \|=_PY_FAIL_IF_INTERRUPTED;
		}

		return _PyMutex_LockTimed((PyMutex *)lock, timeout, flags);
Expand Down