Merged revisions 76137,76172 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76137 | antoine.pitrou | 2009-11-06 23:34:35 +0100 (ven., 06 nov. 2009) | 4 lines
Issue #7270: Add some dedicated unit tests for multi-thread synchronization
primitives such as Lock, RLock, Condition, Event and Semaphore.
........
r76172 | antoine.pitrou | 2009-11-09 17:00:11 +0100 (lun., 09 nov. 2009) | 5 lines
Issue #7282: Fix a memory leak when an RLock was used in a thread other
than those started through `threading.Thread` (for example, using
`thread.start_new_thread()`.
........
diff --git a/Lib/threading.py b/Lib/threading.py
index 18c28b7..15c5f29 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -106,14 +106,16 @@
def __repr__(self):
owner = self.__owner
- return "<%s(%s, %d)>" % (
- self.__class__.__name__,
- owner and owner.name,
- self.__count)
+ try:
+ owner = _active[owner].name
+ except KeyError:
+ pass
+ return "<%s owner=%r count=%d>" % (
+ self.__class__.__name__, owner, self.__count)
def acquire(self, blocking=1):
- me = current_thread()
- if self.__owner is me:
+ me = _get_ident()
+ if self.__owner == me:
self.__count = self.__count + 1
if __debug__:
self._note("%s.acquire(%s): recursive success", self, blocking)
@@ -132,7 +134,7 @@
__enter__ = acquire
def release(self):
- if self.__owner is not current_thread():
+ if self.__owner != _get_ident():
raise RuntimeError("cannot release un-acquired lock")
self.__count = count = self.__count - 1
if not count:
@@ -168,7 +170,7 @@
return (count, owner)
def _is_owned(self):
- return self.__owner is current_thread()
+ return self.__owner == _get_ident()
def Condition(*args, **kwargs):