Merged revisions 76117 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76117 | antoine.pitrou | 2009-11-05 14:42:29 +0100 (jeu., 05 nov. 2009) | 5 lines
Issue #7264: Fix a possible deadlock when deallocating thread-local objects
which are part of a reference cycle.
........
diff --git a/Lib/threading.py b/Lib/threading.py
index 1182f19..18c28b7 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -815,6 +815,10 @@
active_count = activeCount
+def _enumerate():
+ # Same as enumerate(), but without the lock. Internal use only.
+ return _active.values() + _limbo.values()
+
def enumerate():
_active_limbo_lock.acquire()
active = _active.values() + _limbo.values()