May 22, 2025 · May 20, 2025 · May 20, 2025 · May 20, 2025 · May 20, 2025 · May 20, 2025
diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
        lock.release()
        self.assertFalse(lock.locked())

    def test_locked_with_2threads(self):
        # see gh-134323: check that a rlock which
        # is acquired in a different thread,
        # is still locked in the main thread.
        result = []
        rlock = self.locktype()
        self.assertFalse(rlock.locked())
        def acquire():
            result.append(rlock.locked())
            rlock.acquire()
            result.append(rlock.locked())

        with Bunch(acquire, 1):
            pass
        self.assertTrue(rlock.locked())
        self.assertFalse(result[0])
        self.assertTrue(result[1])

    def test_release_save_unacquired(self):
        # Cannot _release_save an unacquired lock
        lock = self.locktype()
diff --git a/Lib/threading.py b/Lib/threading.py
        except KeyError:
            pass
        return "<%s %s.%s object owner=%r count=%d at %s>" % (
            "locked" if self._block.locked() else "unlocked",
            "locked" if self.locked() else "unlocked",
            self.__class__.__module__,
            self.__class__.__qualname__,
            owner,

    def locked(self):
        """Return whether this object is locked."""
        return self._count > 0
        return self._block.locked()

    # Internal methods used by condition variables

diff --git a/Misc/NEWS.d/next/Library/2025-05-20-19-16-30.gh-issue-134323.ZQZGvw.rst b/Misc/NEWS.d/next/Library/2025-05-20-19-16-30.gh-issue-134323.ZQZGvw.rst
 Fix the :meth:`threading.RLock.locked` method.
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
    return 0;
 }

 static int
 rlock_locked_impl(rlockobject *self)
 {
    return PyMutex_IsLocked(&self->lock.mutex);
 }

 static void
 rlock_dealloc(PyObject *self)
 rlock_locked(PyObject *op, PyObject *Py_UNUSED(ignored))
 {
    rlockobject *self = rlockobject_CAST(op);
    int is_locked =_PyRecursiveMutex_IsLockedByCurrentThread(&self->lock);
    int is_locked =rlock_locked_impl(self);
    return PyBool_FromLong(is_locked);
 }

 {
    rlockobject *self = rlockobject_CAST(op);
    PyThread_ident_t owner = self->lock.thread;
    int locked = rlock_locked_impl(self);
    size_t count = self->lock.level + 1;
    return PyUnicode_FromFormat(
        "<%s %s object owner=%" PY_FORMAT_THREAD_IDENT_T " count=%zu at %p>",
 owner ? "locked" : "unlocked",
 locked ? "locked" : "unlocked",
        Py_TYPE(self)->tp_name, owner,
        count, self);
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -370,6 +370,24 @@ def test_locked(self):
		lock.release()
		self.assertFalse(lock.locked())

		def test_locked_with_2threads(self):
		# see gh-134323: check that a rlock which
		# is acquired in a different thread,
		# is still locked in the main thread.
		result = []
		rlock = self.locktype()
YvesDup marked this conversation as resolved. Show resolvedHide resolved
		self.assertFalse(rlock.locked())
		def acquire():
		result.append(rlock.locked())
		rlock.acquire()
YvesDup marked this conversation as resolved. Show resolvedHide resolved
		result.append(rlock.locked())

		with Bunch(acquire, 1):
		pass
		self.assertTrue(rlock.locked())
		self.assertFalse(result[0])
		self.assertTrue(result[1])

		def test_release_save_unacquired(self):
		# Cannot _release_save an unacquired lock
		lock = self.locktype()
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -158,7 +158,7 @@ def __repr__(self):
		except KeyError:
		pass
		return "<%s %s.%s object owner=%r count=%d at %s>" % (
		"locked" if self._block.locked() else "unlocked",
		"locked" if self.locked() else "unlocked",
		self.__class__.__module__,
		self.__class__.__qualname__,
		owner,
Expand DownExpand Up		@@ -237,7 +237,7 @@ def __exit__(self, t, v, tb):

		def locked(self):
		"""Return whether this object is locked."""
		return self._count > 0
		return self._block.locked()
YvesDup marked this conversation as resolved. Show resolvedHide resolved

		# Internal methods used by condition variables

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1022,6 +1022,11 @@ rlock_traverse(PyObject self, visitproc visit, void arg)
		return 0;
		}

		static int
		rlock_locked_impl(rlockobject *self)
		{
		return PyMutex_IsLocked(&self->lock.mutex);
		}

		static void
		rlock_dealloc(PyObject *self)
Expand DownExpand Up		@@ -1111,7 +1116,7 @@ static PyObject *
		rlock_locked(PyObject op, PyObject Py_UNUSED(ignored))
		{
		rlockobject *self = rlockobject_CAST(op);
		int is_locked =_PyRecursiveMutex_IsLockedByCurrentThread(&self->lock);
		int is_locked =rlock_locked_impl(self);
		return PyBool_FromLong(is_locked);
		}

Expand DownExpand Up		@@ -1219,10 +1224,11 @@ rlock_repr(PyObject *op)
		{
		rlockobject *self = rlockobject_CAST(op);
		PyThread_ident_t owner = self->lock.thread;
		int locked = rlock_locked_impl(self);
		size_t count = self->lock.level + 1;
		return PyUnicode_FromFormat(
		"<%s %s object owner=%" PY_FORMAT_THREAD_IDENT_T " count=%zu at %p>",
		owner ? "locked" : "unlocked",
		locked ? "locked" : "unlocked",
		Py_TYPE(self)->tp_name, owner,
		count, self);
		}
Expand Down