Use single bit in the enum value

Author: encukou

Include/internal/pycore_lock.h

@@ -54,8 +54,8 @@ typedef enum _PyLockFlags {
 
     // Locking & unlocking this lock requires attached thread state.
     // If locking returns PY_LOCK_FAILURE, a Python exception *may* be raised.
-    // Implies _PY_LOCK_HANDLE_SIGNALS and _PY_LOCK_DETACH.
-    _PY_LOCK_PYTHONLOCK = 8 | 2 | 1,
+    // (Intended for use with _PY_LOCK_HANDLE_SIGNALS and _PY_LOCK_DETACH.)
+    _PY_LOCK_PYTHONLOCK = 8,
 } _PyLockFlags;
 
 // Lock a mutex with an optional timeout and additional options. See

Modules/_threadmodule.c

@@ -834,8 +834,9 @@ lock_PyThread_acquire_lock(PyObject *op, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    PyLockStatus r = _PyMutex_LockTimed(&self->lock, timeout,
-                                        _PY_LOCK_PYTHONLOCK);
+    PyLockStatus r = _PyMutex_LockTimed(
+        &self->lock, timeout,
+        _PY_LOCK_PYTHONLOCK | _PY_LOCK_HANDLE_SIGNALS | _PY_LOCK_DETACH);
     if (r == PY_LOCK_INTR) {
         assert(PyErr_Occurred());
         return NULL;
@@ -1058,8 +1059,9 @@ rlock_acquire(PyObject *op, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    PyLockStatus r = _PyRecursiveMutex_LockTimed(&self->lock, timeout,
-                                                 _PY_LOCK_PYTHONLOCK);
+    PyLockStatus r = _PyRecursiveMutex_LockTimed(
+        &self->lock, timeout,
+        _PY_LOCK_PYTHONLOCK | _PY_LOCK_HANDLE_SIGNALS | _PY_LOCK_DETACH);
     if (r == PY_LOCK_INTR) {
         assert(PyErr_Occurred());
         return NULL;