Skip to content

gh-134322: fix the __repr__ value of threading.RLock from _threadmodule, when just created #134389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 22, 2025
Merged

gh-134322: fix the __repr__ value of threading.RLock from _threadmodule, when just created #134389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c06df43
Iniial commit
YvesDup May 20, 2025
57b0402
Apply suggestions from code review
YvesDup May 21, 2025
6487bef
Apply last suggestions
YvesDup May 22, 2025
b1d870b
Merge branch 'main' into rlock-threading-erronous-count
YvesDup May 22, 2025
5d6ba2f
Merge branch 'main' into rlock-threading-erronous-count
YvesDup May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Lib/test/lock_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,11 @@ class RLockTests(BaseLockTests):
"""
Tests for recursive locks.
"""
def test_locked_repr(self):
super().test_locked_repr()
lock = self.locktype()
self.assertIn("count=0", repr(lock))

def test_reacquire(self):
lock = self.locktype()
lock.acquire()
Expand Down
3 changes: 2 additions & 1 deletion Modules/_threadmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1219,7 +1219,8 @@ rlock_repr(PyObject *op)
{
rlockobject *self = rlockobject_CAST(op);
PyThread_ident_t owner = self->lock.thread;
size_t count = self->lock.level + 1;
size_t count = _PyRecursiveMutex_IsLockedByCurrentThread(&self->lock) ?
self->lock.level + 1 : 0;
return PyUnicode_FromFormat(
"<%s %s object owner=%" PY_FORMAT_THREAD_IDENT_T " count=%zu at %p>",
owner ? "locked" : "unlocked",
Expand Down
Loading