Apply last suggestions

Author: YvesDup

Lib/test/lock_tests.py

@@ -340,7 +340,7 @@ class RLockTests(BaseLockTests):
     def test_repr_count(self):
         # see gh-134322: check that count values are correct:
         # when a rlock is just created,
-        # in a secondary thread when rlock is acquired in the main thread.
+        # in a second thread when rlock is acquired in the main thread.
         lock = self.locktype()
         self.assertIn("count=0", repr(lock))
         self.assertIn("<unlocked", repr(lock))
@@ -349,13 +349,13 @@ def test_repr_count(self):
         self.assertIn("count=2", repr(lock))
         self.assertIn("<locked", repr(lock))
 
-        l = []
-        def acquire():
-            l.append(repr(lock))
-        with Bunch(acquire, 1):
+        result = []
+        def call_repr():
+            result.append(repr(lock))
+        with Bunch(call_repr, 1):
             pass
-        self.assertIn("count=2", l[0])
-        self.assertIn("<locked", l[0])
+        self.assertIn("count=2", result[0])
+        self.assertIn("<locked", result[0])
 
     def test_reacquire(self):
         lock = self.locktype()

Modules/_threadmodule.c

@@ -1022,15 +1022,12 @@ rlock_traverse(PyObject *self, visitproc visit, void *arg)
     return 0;
 }
 
-/*
-helper function used by rlock_locked and rlock_repr.
-*/
 static int
-rlock_locked_impl(rlockobject *self) {
+rlock_locked_impl(rlockobject *self)
+{
     return PyMutex_IsLocked(&self->lock.mutex);
 }
 
-
 static void
 rlock_dealloc(PyObject *self)
 {
@@ -1227,16 +1224,17 @@ 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;
-    if (rlock_locked_impl(self)) {
+    if (locked) {
         count = self->lock.level + 1;
     }
     else {
         count = 0;
     }
     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);
 }