Merged revisions 76119 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76119 | antoine.pitrou | 2009-11-05 14:49:14 +0100 (jeu., 05 nov. 2009) | 10 lines
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 88101b0..d5412e9 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -798,6 +798,10 @@
activeCount = active_count
+def _enumerate():
+ # Same as enumerate(), but without the lock. Internal use only.
+ return list(_active.values()) + list(_limbo.values())
+
def enumerate():
with _active_limbo_lock:
return list(_active.values()) + list(_limbo.values())