Commit3effede

and

authored

gh-134323: Fix the newthreading.RLock.locked method (#134368)

Co-authored-by: Kumar Aditya <kumaraditya@python.org>

1 parentbd4046f commit3effedeCopy full SHA for 3effede

File tree

+29

-4

lines changed

+29

-4

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -370,6 +370,24 @@ def test_locked(self):`
`370`	`370`	`lock.release()`
`371`	`371`	`self.assertFalse(lock.locked())`
`372`	`372`
	`373`	`+deftest_locked_with_2threads(self):`
	`374`	`+# see gh-134323: check that a rlock which`
	`375`	`+# is acquired in a different thread,`
	`376`	`+# is still locked in the main thread.`
	`377`	`+result= []`
	`378`	`+rlock=self.locktype()`
	`379`	`+self.assertFalse(rlock.locked())`
	`380`	`+defacquire():`
	`381`	`+result.append(rlock.locked())`
	`382`	`+rlock.acquire()`
	`383`	`+result.append(rlock.locked())`
	`384`	`+`
	`385`	`+withBunch(acquire,1):`
	`386`	`+pass`
	`387`	`+self.assertTrue(rlock.locked())`
	`388`	`+self.assertFalse(result[0])`
	`389`	`+self.assertTrue(result[1])`
	`390`	`+`
`373`	`391`	`deftest_release_save_unacquired(self):`
`374`	`392`	`# Cannot _release_save an unacquired lock`
`375`	`393`	`lock=self.locktype()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ def __repr__(self):`
`158`	`158`	`exceptKeyError:`
`159`	`159`	`pass`
`160`	`160`	`return"<%s %s.%s object owner=%r count=%d at %s>"% (`
`161`		`-"locked"ifself._block.locked()else"unlocked",`
	`161`	`+"locked"ifself.locked()else"unlocked",`
`162`	`162`	`self.__class__.__module__,`
`163`	`163`	`self.__class__.__qualname__,`
`164`	`164`	`owner,`
`@@ -237,7 +237,7 @@ def __exit__(self, t, v, tb):`
`237`	`237`
`238`	`238`	`deflocked(self):`
`239`	`239`	`"""Return whether this object is locked."""`
`240`		`-returnself._count>0`
	`240`	`+returnself._block.locked()`
`241`	`241`
`242`	`242`	`# Internal methods used by condition variables`
`243`	`243`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix the:meth:`threading.RLock.locked` method.

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1022,6 +1022,11 @@ rlock_traverse(PyObject self, visitproc visit, void arg)`
`1022`	`1022`	`return0;`
`1023`	`1023`	`}`
`1024`	`1024`
	`1025`	`+staticint`
	`1026`	`+rlock_locked_impl(rlockobject*self)`
	`1027`	`+{`
	`1028`	`+returnPyMutex_IsLocked(&self->lock.mutex);`
	`1029`	`+}`
`1025`	`1030`
`1026`	`1031`	`staticvoid`
`1027`	`1032`	`rlock_dealloc(PyObject*self)`
`@@ -1111,7 +1116,7 @@ static PyObject *`
`1111`	`1116`	`rlock_locked(PyObjectop,PyObjectPy_UNUSED(ignored))`
`1112`	`1117`	`{`
`1113`	`1118`	`rlockobject*self=rlockobject_CAST(op);`
`1114`		`-intis_locked=_PyRecursiveMutex_IsLockedByCurrentThread(&self->lock);`
	`1119`	`+intis_locked=rlock_locked_impl(self);`
`1115`	`1120`	`returnPyBool_FromLong(is_locked);`
`1116`	`1121`	`}`
`1117`	`1122`
`@@ -1219,10 +1224,11 @@ rlock_repr(PyObject *op)`
`1219`	`1224`	`{`
`1220`	`1225`	`rlockobject*self=rlockobject_CAST(op);`
`1221`	`1226`	`PyThread_ident_towner=self->lock.thread;`
	`1227`	`+intlocked=rlock_locked_impl(self);`
`1222`	`1228`	`size_tcount=self->lock.level+1;`
`1223`	`1229`	`returnPyUnicode_FromFormat(`
`1224`	`1230`	`"<%s %s object owner=%"PY_FORMAT_THREAD_IDENT_T" count=%zu at %p>",`
`1225`		`-owner ?"locked" :"unlocked",`
	`1231`	`+locked ?"locked" :"unlocked",`
`1226`	`1232`	`Py_TYPE(self)->tp_name,owner,`
`1227`	`1233`	`count,self);`
`1228`	`1234`	`}`

Comments

(0)